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

[Julien Nabet]

 connectivity/source/drivers/macab/MacabRecord.cxx  |    1 +
 connectivity/source/drivers/macab/MacabRecords.cxx |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 0d9db27cb03e393397f292b9e09b4ac515a4b883
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Aug 17 23:07:35 2017 +0200

    Related tdf#111634: Multiple memory leaks in libmacabdrv1 (part3)
    
    Hope it'll fix leak from https://bugs.documentfoundation.org/show_bug.cgi?id=111634#c13
    
    Change-Id: I61a51faf291145c8cafd03339b7bcc7b23072fba
    Reviewed-on: https://gerrit.libreoffice.org/41268
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 27b1e21913d8119ea27be05954156d15ca069e66)
    Reviewed-on: https://gerrit.libreoffice.org/41269
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index d2195a823379..942f5930035b 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -54,6 +54,7 @@ MacabRecord::~MacabRecord()
 {
     if(size > 0)
     {
+        releaseFields();
         int i;
         for(i = 0; i < size; i++)
         {
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index ccc4dc3e8f6e..958fdd87c901 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -188,6 +188,8 @@ void MacabRecords::initialize()
 
 MacabRecords::~MacabRecords()
 {
+    delete [] lcl_CFTypes;
+    delete [] requiredProperties;
 }