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

[Julien Nabet]

 cui/source/inc/treeopt.hxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 41981d4cb48e66b6fdb32cdc3ae65632af9593dc
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Dec 16 15:58:10 2017 +0100

    Related tdf#114457: fix leak in treeopt (cui)
    
    Change-Id: I28bd32d01bb3d90e68e816720b1b5af7d517760f
    Reviewed-on: https://gerrit.libreoffice.org/46602
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 274076d9d99f..6bb74abb86eb 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -101,6 +101,12 @@ struct OptionsNode
         for ( size_t i = 0; i < m_aLeaves.size(); ++i )
             delete m_aLeaves[i];
         m_aLeaves.clear();
+        for (auto & oneGroupLeaves : m_aGroupedLeaves)
+        {
+            for (auto const& leaf : oneGroupLeaves)
+                delete leaf;
+            oneGroupLeaves.clear();
+        }
         m_aGroupedLeaves.clear();
     }
 };