DEVEL15-windows-wix-custom-20080731

LICENSE MIT

in c++, arrays allocated with new[] must be deallocated with delete[]

(cherry picked from commit 14e516f1d5304a1b00c40321124a6b2067b977f2)

diff --git a/src/WINNT/install/wix/custom/afscustom.cpp b/src/WINNT/install/wix/custom/afscustom.cpp
index edf195598089fe8ff8b054c4cea740bff4009159..08f15544e00e3e67ea4397d847c66f29f0055e6a 100644 (file)
--- a/src/WINNT/install/wix/custom/afscustom.cpp
+++ b/src/WINNT/install/wix/custom/afscustom.cpp
@@ -1,6 +1,7 @@
 /*
 
 Copyright 2004 by the Massachusetts Institute of Technology
+Copyright 2008 by Secure Endpoints Inc.
 
 All rights reserved.
 
@@ -96,9 +97,9 @@ MSIDLLEXPORT AbortMsiImmediate( MSIHANDLE hInstall ) {
        MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, hRecord);
 
 _cleanup:
-       if(sFormatted) delete sFormatted;
+       if(sFormatted) delete[] sFormatted;
        if(hRecord) MsiCloseHandle( hRecord );
-       if(sReason) delete sReason;
+       if(sReason) delete[] sReason;
 
        return ~ERROR_SUCCESS;
 }
@@ -205,7 +206,7 @@ _cleanup:
         ShowMsiError( hInstall, ERR_NPI_FAILED, rv );
     }
     
-    if(strOrder) delete strOrder;
+    if(strOrder) delete[] strOrder;
     
     return rv;
 }
@@ -259,8 +260,8 @@ int npi_CheckAndAddRemove( LPTSTR str, LPTSTR str2, int bInst ) {
 
 cleanup:
 
-    delete target;
-    delete charset;
+    delete[] target;
+    delete[] charset;
     return ret;
 }
 
@@ -369,7 +370,7 @@ _cleanup:
        if(pInfo.hProcess)      CloseHandle( pInfo.hProcess );
        if(pInfo.hThread)       CloseHandle( pInfo.hThread );
        if(hJob) CloseHandle(hJob);
-       if(strPathUninst) delete strPathUninst;
+       if(strPathUninst) delete[] strPathUninst;
 
        if(rv != ERROR_SUCCESS) {
         ShowMsiError( hInstall, ERR_NSS_FAILED, rv );