[parser] Fix dynamically-sized array initializer causing the parser t…

…o lock up. Also fix a debug assertion along the way.
POV-Ray · Nov 28, 2018 · a9eb1a6 · a9eb1a6
1 parent a969d8f
commit a9eb1a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/source/parser/parser.cpp b/source/parser/parser.cpp
@@ -11224,13 +11224,13 @@ bool Parser::POV_ARRAY::HasElement(size_t i) const
 
 const int& Parser::POV_ARRAY::ElementType(size_t i) const
 {
-    POV_PARSER_ASSERT(i < DataPtrs.size());
+    POV_PARSER_ASSERT(resizable || (i < DataPtrs.size()));
     return (mixedType ? Types[i] : Type_);
 }
 
 int& Parser::POV_ARRAY::ElementType(size_t i)
 {
-    POV_PARSER_ASSERT(i < DataPtrs.size());
+    POV_PARSER_ASSERT(resizable || (i < DataPtrs.size()));
     return (mixedType ? Types[i] : Type_);
 }
 

diff --git a/source/parser/parser_tokenizer.cpp b/source/parser/parser_tokenizer.cpp
@@ -3931,8 +3931,11 @@ void Parser::Parse_Initalizer (int Sub, size_t Base, POV_ARRAY *a)
 
                     CASE (RIGHT_CURLY_TOKEN)
                         if (a->resizable)
+                        {
+                            finalParameter = true;
                             // We reserved one element too many.
                             a->Shrink();
+                        }
                         else
                         {
                             if (!(finalParameter && properlyDelimited))