vala: Avoid subsequent critical caused by invalid array type for constant

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35b610d2ab45e703cb09869d72e51717b531e88d..bfd7ac8e54c44e20019a260c8349ee77d2245dc3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -75,6 +75,7 @@ TESTS = \
        basic-types/bug777697.test \
        basic-types/bug787152.vala \
        basic-types/bug788775.vala \
+       constants/array-type-invalid.test \
        constants/glog.vala \
        arrays/cast-silent-invalid.test \
        arrays/class-field-length-cname.vala \

diff --git a/tests/constants/array-type-invalid.test b/tests/constants/array-type-invalid.test
new file mode 100644 (file)
index 0000000..eb894d5
--- /dev/null
+++ b/tests/constants/array-type-invalid.test
@@ -0,0 +1,6 @@
+Invalid Code
+
+const int[,4] FOO = { { 23 }, { 42 } };
+
+void main() {
+}

diff --git a/vala/valaconstant.vala b/vala/valaconstant.vala
index b0beddc2b3d7ff437d80310d353c13f610130bad..ba0c5660c647e1b149243922800832a774b18478 100644 (file)
--- a/vala/valaconstant.vala
+++ b/vala/valaconstant.vala
@@ -131,7 +131,7 @@ public class Vala.Constant : Symbol {
                        } else {
                                value.target_type = type_reference;
 
-                               if (!value.check (context)) {
+                               if (!value.check (context) || type_reference.error) {
                                        error = true;
                                        return false;
                                }

diff --git a/vala/valainitializerlist.vala b/vala/valainitializerlist.vala
index 08ced48aa80e168099c45b25ba9b9c2a53f9b28c..93411e4702b5e09808996c2e676ea3dff46bca5b 100644 (file)
--- a/vala/valainitializerlist.vala
+++ b/vala/valainitializerlist.vala
@@ -141,6 +141,9 @@ public class Vala.InitializerList : Expression {
                        error = true;
                        Report.error (source_reference, "initializer list used for unknown type");
                        return false;
+               } else if (target_type.error) {
+                       error = true;
+                       return false;
                } else if (target_type is ArrayType) {
                        /* initializer is used as array initializer */
                        unowned ArrayType array_type = (ArrayType) target_type;