From ae8a688555b951d447120800006a1f6abfe7ebb5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 13 Feb 2014 12:14:36 +0200
Subject: cid#704597 dereference after null check

this code dates back to the first commit, if the null check was
valid the dereference should have triggered a bug by now.

Change-Id: If074f68bde6a63083921f687e700321488842364
---
 cui/source/customize/cfg.cxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'cui/source/customize/cfg.cxx')

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index f52a7e44e282..7402c3d0bae3 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3986,10 +3986,7 @@ void
 ToolbarSaveInData::SetEntries( SvxEntries* pNewEntries )
 {
     // delete old menu hierarchy first
-    if ( pRootEntry != NULL && pRootEntry->GetEntries() != NULL )
-    {
-        delete pRootEntry->GetEntries();
-    }
+    delete pRootEntry->GetEntries();
 
     // now set new menu hierarchy
     pRootEntry->SetEntries( pNewEntries );
-- 
cgit