diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-06-15 11:02:32 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-06-15 11:09:07 +0200 |
| commit | 90c240cf503147d6e2d3996dbea5492e8126bed8 (patch) | |
| tree | 56fba532416562789c22e6413a0040ebcf95866b /connectivity | |
| parent | 966e0aa952050c2befa84e03e0fd174b7238ee65 (diff) | |
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)
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index e2cf55c67fdc..f0590c1ceb8e 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]; |