From 5de65dc2d6887a9c7a5b4faa23caa53f8c05c2d0 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 27 Jan 2014 03:14:59 -0600
Subject: coverity#440706 : Explicit null dereferenced

Change-Id: I9c078ba5cb413bdb1c790adc327796a85d870974
---
 connectivity/source/parse/sqlnode.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'connectivity')

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) ||
-- 
cgit