[vala] Fix critical on invalid element access



commit bdb329efb5e5c35001c41b72f5c1dc0f603b320c
Author: Jürg Billeter <j bitron ch>
Date:   Fri Jul 31 15:30:15 2009 +0200

    Fix critical on invalid element access
    
    Fixes bug 590339.

 vala/valaelementaccess.vala |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/vala/valaelementaccess.vala b/vala/valaelementaccess.vala
index c22131f..4faf6d2 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;
 		}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]