[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source

[Norbert Thiebaud]

 connectivity/source/drivers/macab/MacabResultSet.cxx |    5 +++++
 connectivity/source/drivers/macab/MacabStatement.cxx |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 954840d55ede990b368c5314bdb876ced56cfbe2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Feb 3 16:12:50 2015 +0100

    tdf#89048 Macab initialize record list even for never-match condition.
    
    Change-Id: I323f6532d00f30cde50616e9399cad6bbe00cb8c
    Reviewed-on: https://gerrit.libreoffice.org/14310
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index d0206df..934db87 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -86,6 +86,11 @@ void MacabResultSet::someMacabRecords(const MacabCondition *pCondition)
     // maximum alloted size, which means that we'll never have to resize)
     m_aMacabRecords = new MacabRecords(allRecords);
 
+    if(pCondition->isAlwaysFalse())
+    {
+        return;
+    }
+
     MacabRecords::iterator iterator;
 
     for (iterator = allRecords->begin();
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index c5a0c3e..800acc1 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -331,7 +331,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ
             MacabCondition *pCondition = analyseWhereClause(pParseNode);
             if (pCondition->isAlwaysTrue())
                 pResult->allMacabRecords();
-            else if (!pCondition->isAlwaysFalse())
+            else
                 pResult->someMacabRecords(pCondition);
             delete pCondition;
             return;