diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-01-27 03:14:59 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-01-27 03:24:18 -0600 |
commit | 5de65dc2d6887a9c7a5b4faa23caa53f8c05c2d0 (patch) | |
tree | b666ae9d926f20812052f51402a15a4eea46c7ec /connectivity | |
parent | coverity#1038499 : Uninitialized scalar field (diff) | |
download | core-5de65dc2d6887a9c7a5b4faa23caa53f8c05c2d0.tar.gz core-5de65dc2d6887a9c7a5b4faa23caa53f8c05c2d0.zip |
coverity#440706 : Explicit null dereferenced
Change-Id: I9c078ba5cb413bdb1c790adc327796a85d870974
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 4f56f30c1392..fe59e8108e23 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1983,7 +1983,6 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_ { assert(pSearchCondition->count() == 3); OSQLParseNode* pComparison = pSearchCondition->getChild(1); - OSQLParseNode* pNewComparison = NULL; if(SQL_ISRULE(pComparison, comparison)) { assert(pComparison->count() == 2 || @@ -2004,6 +2003,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_ } else { + OSQLParseNode* pNewComparison = NULL; switch(pComparison->getNodeType()) { case SQL_NODE_EQUAL: @@ -2028,9 +2028,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_ SAL_WARN( "connectivity.parse", "OSQLParseNode::negateSearchCondition: unexpected node type!" ); break; } + pSearchCondition->replace(pComparison, pNewComparison); + delete pComparison; } - pSearchCondition->replace(pComparison, pNewComparison); - delete pComparison; } else if(bNegate && (SQL_ISRULE(pSearchCondition,test_for_null) || |