From: Jürg Billeter <j@bitron.ch>
Date: Fri, 31 Jul 2009 13:30:15 +0000 (+0200)
Subject: Fix critical on invalid element access
X-Git-Tag: 0.7.5~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdb329efb5e5c35001c41b72f5c1dc0f603b320c;p=thirdparty%2Fvala.git

Fix critical on invalid element access

Fixes bug 590339.
---

diff --git a/vala/valaelementaccess.vala b/vala/valaelementaccess.vala
index c22131f7d..4faf6d280 100644
--- a/vala/valaelementaccess.vala
+++ b/vala/valaelementaccess.vala
@@ -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;
 		}