Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4194

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/4194/1

Fix memory leak in FileDialogHelper_Impl::createMatcher/addFilters.

Before resetting mpMatcher to a new value check whether the current
value needs to be deleted first.

Change-Id: I26039c19483621d809dbd8474b86254948efc9f6
---
M sfx2/source/dialog/filedlghelper.cxx
1 file changed, 6 insertions(+), 0 deletions(-)



diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index c9ab00c..a927cfe 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1769,6 +1769,9 @@
 // ------------------------------------------------------------------------
 void FileDialogHelper_Impl::createMatcher( const String& rFactory )
 {
+    if (mbDeleteMatcher)
+        delete mpMatcher;
+
     mpMatcher = new SfxFilterMatcher( SfxObjectShell::GetServiceNameFromFactory(rFactory) );
     mbDeleteMatcher = sal_True;
 }
@@ -1783,6 +1786,9 @@
     if ( ! xFltMgr.is() )
         return;
 
+    if (mbDeleteMatcher)
+        delete mpMatcher;
+
     // we still need a matcher to convert UI names to filter names
     if ( !rFactory.Len() )
     {

-- 
To view, visit https://gerrit.libreoffice.org/4194
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26039c19483621d809dbd8474b86254948efc9f6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard <mark@klomp.org>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.