Fix crash on invalid error expressions

2009-02-02  Jürg Billeter  <j@bitron.ch>

	* vala/valathrowstatement.vala:

	Fix crash on invalid error expressions

svn path=/trunk/; revision=2416

diff --git a/ChangeLog b/ChangeLog
index 7fb3bdd59b4c10dc8703f906f9626767db89e01e..abf1698f53851e1184fd6e02befde323c58e980d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valathrowstatement.vala:
+
+       Fix crash on invalid error expressions
+
 2009-02-01  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaproperty.vala:

diff --git a/vala/valathrowstatement.vala b/vala/valathrowstatement.vala
index 4b4da01fa5e190f402659b26f7169c4c6a901181..4ff77241b86286544646df267a4823a55e2ff1f2 100644 (file)
--- a/vala/valathrowstatement.vala
+++ b/vala/valathrowstatement.vala
@@ -89,6 +89,12 @@ public class Vala.ThrowStatement : CodeNode, Statement {
                                return false;
                        }
 
+                       if (error_expression.value_type == null) {
+                               Report.error (error_expression.source_reference, "invalid error expression");
+                               error = true;
+                               return false;
+                       }
+
                        if (!(error_expression.value_type is ErrorType)) {
                                Report.error (error_expression.source_reference, "`%s' is not an error type".printf (error_expression.value_type.to_string ()));
                                error = true;