diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-13 12:14:36 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-14 11:38:03 +0200 |
commit | ae8a688555b951d447120800006a1f6abfe7ebb5 (patch) | |
tree | 3b1b9f43bb23816ace8221776b649ec721417ed2 | |
parent | cid#704596 dereference after null check (diff) | |
download | core-ae8a688555b951d447120800006a1f6abfe7ebb5.tar.gz core-ae8a688555b951d447120800006a1f6abfe7ebb5.zip |
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
-rw-r--r-- | cui/source/customize/cfg.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
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 ); |