[Libreoffice-commits] core.git: connectivity/source
Norbert Thiebaud
nthiebaud at gmail.com
Tue Feb 3 07:13:56 PST 2015
connectivity/source/drivers/macab/MacabResultSet.cxx | 5 +++++
connectivity/source/drivers/macab/MacabStatement.cxx | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 90c3e6905daefad3d57c14090cd30a0d280ec989
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
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 35a8717..73dd60d 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 2de3f3f..654b029 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -329,7 +329,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;
More information about the Libreoffice-commits
mailing list