[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/inc scripting/source solenv/gbuild

[Libreoffice Gerrit user]

 sal/inc/osl/profile.hxx                            |    8 ++++----
 scripting/source/stringresource/stringresource.cxx |    2 +-
 solenv/gbuild/CustomTarget.mk                      |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3cc7c171ef01fd267ae29f0f70d473e79d99c356
Author:     Don Lewis <truckman at apache.org>
AuthorDate: Sat Aug 18 07:25:26 2018 +0000
Commit:     Don Lewis <truckman at apache.org>
CommitDate: Sat Aug 18 07:25:26 2018 +0000

    Arrays allocated with new [] should be freed using delete[].

diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx
index 25bafed6d520..26f2ef9ae6df 100644
--- a/sal/inc/osl/profile.hxx
+++ b/sal/inc/osl/profile.hxx
@@ -103,7 +103,7 @@ namespace osl {
             }
             pStrings[ nItems ] = NULL;
             sal_uInt32 nRet = osl_readProfileIdent( profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nDefault);
-            delete pStrings;
+            delete[] pStrings;
             return nRet;
         }
 
@@ -134,7 +134,7 @@ namespace osl {
             pStrings[ nItems ] = NULL;
             sal_Bool bRet =
                 osl_writeProfileIdent( profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nValue );
-            delete pStrings;
+            delete[] pStrings;
             return bRet;
         }
 
@@ -164,7 +164,7 @@ namespace osl {
                 int nLen;
                 for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
                     aEntries.push_back( rtl::OString( pBuf+n ) );
-                delete pBuf;
+                delete[] pBuf;
             }
 
             return aEntries;
@@ -187,7 +187,7 @@ namespace osl {
                 int nLen;
                 for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
                     aSections.push_back( rtl::OString( pBuf+n ) );
-                delete pBuf;
+                delete[] pBuf;
             }
 
             return aSections;
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index a9d6b0ba329b..ee15035becf3 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -2300,7 +2300,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale
                     }
                 }
 
-                delete pIdPtrs;
+                delete[] pIdPtrs;
             }
 
             bSuccess = true;
commit b4353325a7d41c97c31532b7e5ac3cebc8b3624e
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Aug 18 06:30:22 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Aug 18 06:30:22 2018 +0000

    Get gbuild's CustomTarget working.
    
    Patch by: me

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 58c96000953f..784fcecd4706 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -56,6 +56,7 @@ $(call gb_CustomTarget_get_target,$(1)) : \
   $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
 $(call gb_CustomTarget_get_workdir,$(1))/% : \
   $(call gb_CustomTarget_get_target,$(1))
+$(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
 endef