fix crash on invalid collection expressions in foreach statements, fixes

2008-03-24  Juerg Billeter  <j@bitron.ch>

	* vala/valasemanticanalyzer.vala: fix crash on invalid collection
	  expressions in foreach statements, fixes bug 524033

svn path=/trunk/; revision=1160

diff --git a/ChangeLog b/ChangeLog
index 5d44bf9..65b4175 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-03-24  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valasemanticanalyzer.vala: fix crash on invalid collection
+         expressions in foreach statements, fixes bug 524033
+
+2008-03-24  Jürg Billeter  <j@bitron.ch>
+
        * vapi/sdl.vapi: add missing public modifier,
          patch by Levi Bard, fixes bug 524192
 

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 45257a0..8d144d3 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -992,6 +992,10 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                        // ignore inner error
                        stmt.error = true;
                        return;
+               } else if (stmt.collection.static_type == null) {
+                       Report.error (stmt.collection.source_reference, "invalid collection expression");
+                       stmt.error = true;
+                       return;
                }
 
                stmt.collection_variable_declarator = new VariableDeclarator ("%s_collection".printf (stmt.variable_name));