[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source

Julien Nabet serval2412 at yahoo.fr
Fri Feb 6 06:32:54 PST 2015


 svx/source/gallery2/galtheme.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7153844e964f1e8895d6ac7b202147729ede997d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Feb 5 20:10:37 2015 +0100

    cppcheck: Returning/dereferencing 'pEntry' after it is deallocated / released
    
    Cherry-picked from c20a2234c5cb9cb89611de8a8a34e9d1e7c7a972
    
    Change-Id: If96b66d5bbfcf4426bb602909599cd36e1f3c994
    Reviewed-on: https://gerrit.libreoffice.org/14350
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index cf64448..90f734d 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -477,6 +477,7 @@ bool GalleryTheme::RemoveObject( size_t nPos )
         Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
         Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
         delete pEntry;
+        pEntry = NULL;
 
         ImplSetModified( true );
         ImplBroadcast( nPos );


More information about the Libreoffice-commits mailing list