From 348b51327fe72fc8ea4292a3b5cb4df178c1d234 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 2 Feb 2012 14:47:07 +1000
Subject: Ensure || expressions in v4 will always exit.

Change-Id: I7188e38403fec96f83f3bdfc68b763a9aec9346a
Task-number: QTBUG-24038
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---
 src/declarative/qml/v4/qv4irbuilder.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/declarative')

diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp
index 2cc1c6eaab..604eeaa713 100644
--- a/src/declarative/qml/v4/qv4irbuilder.cpp
+++ b/src/declarative/qml/v4/qv4irbuilder.cpp
@@ -892,6 +892,7 @@ bool QV4IRBuilder::visit(AST::BinaryExpression *ast)
         _block = iftrue;
         ExprResult right = expression(ast->right);
         _block->MOVE(r, right);
+        _block->JUMP(endif);
 
         if (left.type() != right.type())
             discard();
-- 
cgit v1.2.3