]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Fix critical on invalid element access
authorJürg Billeter <j@bitron.ch>
Fri, 31 Jul 2009 13:30:15 +0000 (15:30 +0200)
committerJürg Billeter <j@bitron.ch>
Fri, 31 Jul 2009 13:30:45 +0000 (15:30 +0200)
Fixes bug 590339.

vala/valaelementaccess.vala

index c22131f7dbaf9a8e7cde0bf860e6c46d3c968fe9..4faf6d2803bfff108fb8d49f04fe715a6a059d52 100644 (file)
@@ -104,11 +104,15 @@ public class Vala.ElementAccess : Expression {
 
                checked = true;
 
-               container.check (analyzer);
+               if (!container.check (analyzer)) {
+                       /* don't proceed if a child expression failed */
+                       error = true;
+                       return false;
+               }
 
                if (container.value_type == null) {
-                       /* don't proceed if a child expression failed */
                        error = true;
+                       Report.error (container.source_reference, "Invalid container expression");
                        return false;
                }