[Libreoffice-commits] core.git: l10ntools/inc

[Stephan Bergmann]

 l10ntools/inc/cfgmerge.hxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ace815b451242b13f492887b004d14337362ae58
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 22 14:17:32 2014 +0200

    Fix memory leak in cfgex tool
    
    Change-Id: Ic8c410a805fa06777c1a85de646df2dcd5b6506a

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index b938a11..1eb5f55 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -74,13 +74,13 @@ public:
     ~CfgStack();
 
     CfgStackData *Push(const OString &rTag, const OString &rId);
-    CfgStackData *Pop()
+    void Pop()
     {
-        if (maList.empty())
-            return NULL;
-        CfgStackData* temp = maList.back();
-        maList.pop_back();
-        return temp;
+        if (!maList.empty())
+        {
+            delete maList.back();
+            maList.pop_back();
+        }
     }
 
     CfgStackData *GetStackData();