[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/gallery2/gallery1.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 48c78c3abba301d1dd197be75958d380913b481f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 24 09:15:50 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 24 13:30:03 2019 +0200

    cid#1448545 silence Wrapper object use after free
    
    Change-Id: Ia1b3137916ae37ed73ac9923af847aa15978dc86
    Reviewed-on: https://gerrit.libreoffice.org/76228
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 79fd2a487d5f..1ee0d7edbf0f 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -717,9 +717,11 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
                 }
             }
 
-            pTheme = pNewTheme.get();
-            if( pTheme )
+            if (pNewTheme)
+            {
                 aThemeCache.push_back( new GalleryThemeCacheEntry( pThemeEntry, std::move(pNewTheme) ));
+                pTheme = aThemeCache.back()->GetTheme();
+            }
         }
     }