summaryrefslogtreecommitdiff
path: root/vala/valaconditionalexpression.vala
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2009-09-14 18:14:39 +0200
committerJürg Billeter <j@bitron.ch>2009-09-14 18:14:39 +0200
commitfc3150d0d356286917d57d7f057240c5a392d3bb (patch)
tree161b6e6798c99417e43863ae446e6b472dc9031c /vala/valaconditionalexpression.vala
parent98785c272674bf54ff95e2fb8c035170c4288bbb (diff)
downloadvala-fc3150d0d356286917d57d7f057240c5a392d3bb.tar.gz
Fix crash when using invalid conditional expressions
Fixes bug 594400.
Diffstat (limited to 'vala/valaconditionalexpression.vala')
-rw-r--r--vala/valaconditionalexpression.vala3
1 files changed, 2 insertions, 1 deletions
diff --git a/vala/valaconditionalexpression.vala b/vala/valaconditionalexpression.vala
index f521bc8f0..6c7e8d66b 100644
--- a/vala/valaconditionalexpression.vala
+++ b/vala/valaconditionalexpression.vala
@@ -137,7 +137,8 @@ public class Vala.ConditionalExpression : Expression {
insert_statement (analyzer.insert_block, decl);
insert_statement (analyzer.insert_block, if_stmt);
- if (!if_stmt.check (analyzer)) {
+ if (!if_stmt.check (analyzer) || true_expression.error || false_expression.error) {
+ error = true;
return false;
}