BaseTool/VfrCompile: make delete[] match with new[]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=764

Cc: Eric Dong <eric.dong@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
index ff2a837dfc8fa8de1c41026bddea7d65c8fe99dd..84c0e59b76f2c47af519066d8cbb000e0d568966 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
@@ -2,7 +2,7 @@
   \r
   VfrCompiler main class and main function.\r
 \r
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -284,7 +284,7 @@ CVfrCompiler::AppendIncludePath (
   strcat (IncludePaths, " -I ");\r
   strcat (IncludePaths, PathStr);\r
   if (mOptions.IncludePaths != NULL) {\r
-    delete mOptions.IncludePaths;\r
+    delete[] mOptions.IncludePaths;\r
   }\r
   mOptions.IncludePaths = IncludePaths;\r
 }\r
@@ -313,7 +313,7 @@ CVfrCompiler::AppendCPreprocessorOptions (
   strcat (Opt, " ");\r
   strcat (Opt, Options);\r
   if (mOptions.CPreprocessorOptions != NULL) {\r
-    delete mOptions.CPreprocessorOptions;\r
+    delete[] mOptions.CPreprocessorOptions;\r
   }\r
   mOptions.CPreprocessorOptions = Opt;\r
 }\r
@@ -531,12 +531,12 @@ CVfrCompiler::~CVfrCompiler (
   }\r
 \r
   if (mOptions.IncludePaths != NULL) {\r
-    delete mOptions.IncludePaths;\r
+    delete[] mOptions.IncludePaths;\r
     mOptions.IncludePaths = NULL;\r
   }\r
 \r
   if (mOptions.CPreprocessorOptions != NULL) {\r
-    delete mOptions.CPreprocessorOptions;\r
+    delete[] mOptions.CPreprocessorOptions;\r
     mOptions.CPreprocessorOptions = NULL;\r
   }\r
 \r
@@ -965,11 +965,11 @@ main (
   }\r
 \r
   if (gCBuffer.Buffer != NULL) {\r
-    delete gCBuffer.Buffer;\r
+    delete[] gCBuffer.Buffer;\r
   }\r
   \r
   if (gRBuffer.Buffer != NULL) {\r
-    delete gRBuffer.Buffer;\r
+    delete[] gRBuffer.Buffer;\r
   }\r
 \r
   return GetUtilityStatus ();\r

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp
index 2366fac5a760bb6565cd72b96f4effb91d3b466e..14771a20449aaec5b655e5ce7a116936b0ff349a 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp
@@ -77,7 +77,7 @@ CVfrErrorHandle::~CVfrErrorHandle (
   SVfrFileScopeRecord *pNode = NULL;\r
 \r
   if (mInputFileName != NULL) {\r
-    delete mInputFileName;\r
+    delete[] mInputFileName;\r
   }\r
 \r
   while (mScopeRecordListHead != NULL) {\r

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 090ee13ef9da2e1b2402294d4d1908d50e5f8999..b40bcdf21fd08231c04fa513ed49c89b9eecc2bd 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -144,7 +144,7 @@ CFormPkg::~CFormPkg ()
     pBNode = mBufferNodeQueueHead;\r
     mBufferNodeQueueHead = mBufferNodeQueueHead->mNext;\r
     if (pBNode->mBufferStart != NULL) {\r
-      delete pBNode->mBufferStart;\r
+      delete[] pBNode->mBufferStart;\r
       delete pBNode;\r
     }\r
   }\r
@@ -1152,7 +1152,7 @@ CIfrRecordInfoDB::IfrRecordOutput (
   SIfrRecord *pNode; \r
 \r
   if (TBuffer.Buffer != NULL) {\r
-    delete TBuffer.Buffer;\r
+    delete[] TBuffer.Buffer;\r
   }\r
 \r
   TBuffer.Size = 0;\r
@@ -2259,7 +2259,7 @@ CIfrObj::_EMIT_PENDING_OBJ (
   // update bin buffer to package data buffer\r
   //\r
   if (mObjBinBuf != NULL) {\r
-    delete mObjBinBuf;\r
+    delete[] mObjBinBuf;\r
     mObjBinBuf = ObjBinBuf;\r
   }\r
   \r

diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 4c7c6f28ff4fdfeb68100b93d84bbf5c1f73a2a6..d48072a8adf058c362f15d307a9de2ba08a1e5b3 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -969,7 +969,7 @@ vfrExtensionData[UINT8 *DataBuff, UINT32 Size, CHAR8 *TypeName, UINT32 TypeSize,
                  break;\r
               }\r
             }\r
-            if (TFName != NULL) { delete TFName; TFName = NULL; }\r
+            if (TFName != NULL) { delete[] TFName; TFName = NULL; }\r
           >>\r
   )*\r
 )\r
@@ -1166,7 +1166,7 @@ vfrStatementVarStoreEfi :
                                                        VSEObj.SetSize ((UINT16) Size);\r
                                                        VSEObj.SetName (StoreName);\r
                                                        if (IsUEFI23EfiVarstore == FALSE && StoreName != NULL) {\r
-                                                         delete StoreName; \r
+                                                         delete[] StoreName;\r
                                                        }\r
                                                     >>\r
   ";"\r
@@ -1324,7 +1324,7 @@ vfrQuestionBaseInfo[EFI_VARSTORE_INFO & Info, EFI_QUESTION_ID & QId, EFI_QUESION
                                                    >>\r
                                                    <<\r
                                                       if (VarIdStr != NULL) {\r
-                                                        delete VarIdStr;\r
+                                                        delete[] VarIdStr;\r
                                                       }\r
                                                       _SAVE_CURRQEST_VARINFO (Info);\r
                                                    >>\r
@@ -1511,7 +1511,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl
                                                        }\r
 \r
                                                        QuestVarIdStr = VarIdStr;\r
-                                                       if (VarStr != NULL) {delete VarStr;}\r
+                                                       if (VarStr != NULL) {delete[] VarStr;}\r
                                                     >>\r
   )\r
   ;\r
@@ -4667,7 +4667,7 @@ getExp[UINT32 & RootLevel, UINT32 & ExpOpCount] :
                                                             CIfrGet GObj(L->getLine()); \r
                                                             _SAVE_OPHDR_COND (GObj, ($ExpOpCount == 0), L->getLine()); \r
                                                             GObj.SetVarInfo (&Info); \r
-                                                            delete VarIdStr; \r
+                                                            delete[] VarIdStr;\r
                                                             $ExpOpCount++;\r
                                                           }\r
                                                        >>\r
@@ -4841,7 +4841,7 @@ setExp[UINT32 & RootLevel, UINT32 & ExpOpCount] :
                                                             }\r
                                                             CIfrSet TSObj(L->getLine()); \r
                                                             TSObj.SetVarInfo (&Info); \r
-                                                            delete VarIdStr; \r
+                                                            delete[] VarIdStr;\r
                                                             $ExpOpCount++;\r
                                                           }\r
                                                        >>\r
@@ -5474,7 +5474,7 @@ EfiVfrParser::_STRCAT (
   NewStr[0] = '\0';\r
   if (*Dest != NULL) {\r
     strcpy (NewStr, *Dest);\r
-    delete *Dest;\r
+    delete[] *Dest;\r
   }\r
   strcat (NewStr, Src);\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
index c536498d771ec9852ece0a74dbb505c8e9bc6db1..9bdc54462c0c8d24b4b905aaf8a518c7325672cf 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
@@ -2,7 +2,7 @@
   \r
   Vfr common library functions.\r
 \r
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -360,7 +360,7 @@ CVfrBufferConfig::Write (
 \r
   case 'i' : // set info\r
     if (mItemListPos->mId != NULL) {\r
-      delete mItemListPos->mId;\r
+      delete[] mItemListPos->mId;\r
     }\r
     mItemListPos->mId = NULL;\r
     if (Id != NULL) {\r
@@ -1630,7 +1630,7 @@ SVfrVarStorageNode::~SVfrVarStorageNode (
   }\r
 \r
   if (mVarStoreType == EFI_VFR_VARSTORE_NAME) {\r
-    delete mStorageInfo.mNameSpace.mNameTable;\r
+    delete[] mStorageInfo.mNameSpace.mNameTable;\r
   }\r
 }\r
 \r
@@ -3489,7 +3489,7 @@ CVfrStringDB::CVfrStringDB ()
 CVfrStringDB::~CVfrStringDB ()\r
 {\r
   if (mStringFileName != NULL) {\r
-    delete mStringFileName;\r
+    delete[] mStringFileName;\r
   }\r
   mStringFileName = NULL;\r
 }\r