connectivity/source/parse/sqlnode.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 90c240cf503147d6e2d3996dbea5492e8126bed8
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sat Jun 15 11:02:32 2013 +0200
fdo#65653, fdo#65619, fdo#65216: Missing check
Problem caused by commit:
16c9ce4877def18ca4578171a96615a632d08092
This commit contains code deduplication.
The deduplication removed one needed check (rParam.xFiled.is()),
which causes segfault when member function of rParam.xField
is called inside columnMatchP().
Change-Id: Ibbdaa758dbbce4b76094e6cc120022ef276b30c4
(cherry picked from commit 10777b37536be16c6d2e167b59e9e31e37ba3517)
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index e2cf55c..f0590c1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -753,7 +753,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw(
OUStringBuffer& rString, c
SQLParseNodeParameter aNewParam(rParam);
//aNewParam.bQuote = sal_True; // why setting this to true? @see
http://www.openoffice.org/issues/show_bug.cgi?id=75557
- if (bSimple && !columnMatchP(m_aChildren[0], rParam))
+ if (bSimple && (!rParam.xField.is() || !columnMatchP(m_aChildren[0],
rParam)))
m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam,
bSimple );
const OSQLParseNode* pPart2 = m_aChildren[1];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
