From fddd20ffad95b8cc92fb3eeb010953be22ab6120 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 24 Aug 2012 21:52:24 +0200
Subject: [PATCH] fix return() sanity check

the value map stack always has at least one map on it.

Change-Id: I836de07a14754b995403065443d3758bfc6a8683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/shared/proparser/qmakebuiltins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index 0192f2b6967..4e41e3f4833 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -1091,7 +1091,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
         // they cannot be used to terminate loops anyway.
         if (m_cumulative)
             return ReturnTrue;
-        if (m_valuemapStack.isEmpty()) {
+        if (m_valuemapStack.size() == 1) {
             evalError(fL1S("unexpected return()."));
             return ReturnFalse;
         }