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

[Julien Nabet]

 connectivity/source/drivers/macab/MacabRecords.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 39a58df9e9f990faf231c2b1c2dc7fcdc1c4a6cf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Aug 11 19:09:24 2017 +0200

    Related tdf#111634: Multiple memory leaks in libmacabdrv1 (part2)
    
    Delete "sub arrays" of headerNames which is macabfield **
    before calling delete headerNames []
    
    Change-Id: I11b6d5483ed91eb2805b68ace1b06eafd23b707d
    Reviewed-on: https://gerrit.libreoffice.org/41054
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 84fc4dec5f419cbe30fa6ac4e228f083837f7887)
    Reviewed-on: https://gerrit.libreoffice.org/41068
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index d5e8d2c6f67f..ccc4dc3e8f6e 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -839,6 +839,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
     {
         manageDuplicateHeaders(headerNames, length);
         MacabHeader *headerResult = new MacabHeader(length, headerNames);
+        for(sal_Int32 i = 0; i < length; ++i)
+            delete headerNames[i];
         delete [] headerNames;
         return headerResult;
     }
commit c68a7c94f02989ac7122be0a319251dbaf344952
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Aug 11 07:44:39 2017 +0200

    Related tdf#111634: Multiple memory leaks in libmacabdrv1
    
    CFRelease multiLabel since has been created from OUStringToCFString
    
    Change-Id: Ic997c026737ebf31049682835d4047f3297f077d
    Reviewed-on: https://gerrit.libreoffice.org/41003
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 5d065a77adf82948909fa76ea0f0ea98f89fd3e6)
    Reviewed-on: https://gerrit.libreoffice.org/41067
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 6894b1e1ecd4..d5e8d2c6f67f 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -663,6 +663,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                     }
                     if(multiValue)
                         CFRelease(multiValue);
+                    if(multiLabel)
+                        CFRelease(multiLabel);
                     multiHeaders.push_back(std::move(hdr));
                 }