fixing double-free in initialzied string arrays, using them in the testcase

[xonotic/gmqcc.git] / parser.c

diff --git a/parser.c b/parser.c
index e6326a9498d3cf259152082c48f31b7c93c1e21f..2b2ebe1b52b15735c81f95df979587df62a839f1 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -5218,10 +5218,15 @@ static bool create_array_accessors(parser_t *parser, ast_value *var)
 
 static bool parse_array(parser_t *parser, ast_value *array)
 {
+    if (array->initlist) {
+        parseerror(parser, "array already initialized elsewhere");
+        return false;
+    }
     if (!parser_next(parser)) {
         parseerror(parser, "parse error in array initializer");
         return false;
     }
+    size_t i = 0;
     while (parser->tok != '}') {
         ast_value *v = (ast_value*)parse_expression_leave(parser, true, false, false);
         if (!v)
@@ -5232,6 +5237,10 @@ static bool parse_array(parser_t *parser, ast_value *array)
             return false;
         }
         vec_push(array->initlist, v->constval);
+        if (v->expression.vtype == TYPE_STRING) {
+            array->initlist[i].vstring = util_strdupe(array->initlist[i].vstring);
+            ++i;
+        }
         ast_unref(v);
         if (parser->tok == '}')
             break;