BaseTools/VfrCompile: Avoid freeing freed memory in classes

For classes that contain dynamically allocated data members, copy
constructor and assignment operator should be implemented or both
operations should be prohibited to avoid freeing freed memory caused by
shallow copy.

This commit declares both copy constructor and assignment operator as
'private' for classes that contain dynamically allocated data members.
This will prevent freeing already freed memory.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/h/DLexerBase.h b/BaseTools/Source/C/VfrCompile/Pccts/h/DLexerBase.h
index db6cc1890c7f9753264d85fefbd7074dcf9812e1..667ecfd81aa50b17b29699ef6acf9682830bd2dc 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/h/DLexerBase.h
+++ b/BaseTools/Source/C/VfrCompile/Pccts/h/DLexerBase.h
@@ -119,6 +119,9 @@ public:
 \r
 /* user must subclass this */\r
 class DllExportPCCTS DLGLexerBase : public ANTLRTokenStream {\r
+private:\r
+    DLGLexerBase(const DLGLexerBase&);             // Prevent copy-construction\r
+    DLGLexerBase& operator=(const DLGLexerBase&);  // Prevent assignment\r
 public:\r
        virtual ANTLRTokenType erraction();\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h
index 8241ce2f84f65d82a485021e92edc06259e5a568..4dbc54c504f1aac61390fb9369c1a19313bd0d53 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.h
+++ b/BaseTools/Source/C/VfrCompile/VfrError.h
@@ -2,7 +2,7 @@
   \r
   VfrCompiler Error definition\r
 \r
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2016, 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
@@ -73,6 +73,10 @@ struct SVfrFileScopeRecord {
 \r
   SVfrFileScopeRecord (IN CHAR8 *, IN UINT32);\r
   ~SVfrFileScopeRecord();\r
+\r
+private:\r
+  SVfrFileScopeRecord (IN CONST SVfrFileScopeRecord&);             // Prevent copy-construction\r
+  SVfrFileScopeRecord& operator= (IN CONST SVfrFileScopeRecord&);  // Prevent assignment\r
 };\r
 \r
 class CVfrErrorHandle {\r
@@ -95,6 +99,10 @@ public:
   UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);\r
   UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);\r
   VOID  PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = "");\r
+\r
+private:\r
+  CVfrErrorHandle (IN CONST CVfrErrorHandle&);             // Prevent copy-construction\r
+  CVfrErrorHandle& operator= (IN CONST CVfrErrorHandle&);  // Prevent assignment\r
 };\r
 \r
 #define CHECK_ERROR_RETURN(f, v) do { EFI_VFR_RETURN_CODE r; if ((r = (f)) != (v)) { return r; } } while (0)\r

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
index 3c7964ac4294051a125777722c73bb13f3c042d7..17ab14c021dfacea7f4f1d064bc335dc90306979 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
@@ -87,6 +87,10 @@ struct SPendingAssign {
   VOID   SetAddrAndLen (IN VOID *, IN UINT32);\r
   VOID   AssignValue (IN VOID *, IN UINT32);\r
   CHAR8 * GetKey (VOID);\r
+\r
+private:\r
+  SPendingAssign (IN CONST SPendingAssign&);             // Prevent copy-construction\r
+  SPendingAssign& operator= (IN CONST SPendingAssign&);  // Prevent assignment\r
 };\r
 \r
 struct SBufferNode {\r
@@ -139,6 +143,10 @@ public:
   EFI_VFR_RETURN_CODE BuildPkg (OUT PACKAGE_DATA &);\r
   EFI_VFR_RETURN_CODE GenCFile (IN CHAR8 *, IN FILE *, IN PACKAGE_DATA *PkgData = NULL);\r
 \r
+private:\r
+  CFormPkg (IN CONST CFormPkg&);             // Prevent copy-construction\r
+  CFormPkg& operator= (IN CONST CFormPkg&);  // Prevent assignment\r
+\r
 public:\r
   EFI_VFR_RETURN_CODE AssignPending (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CONST CHAR8 *Msg = NULL);\r
   VOID                DoPendingAssign (IN CHAR8 *, IN VOID *, IN UINT32);\r
@@ -237,6 +245,10 @@ public:
   VOID        IfrCreateDefaultForQuestion (IN  SIfrRecord *, IN  QuestionDefaultRecord *);\r
   VOID        IfrParseDefaulInfoInQuestion (IN  SIfrRecord *, OUT QuestionDefaultRecord *);\r
   VOID        IfrAddDefaultToBufferConfig (IN  UINT16, IN  SIfrRecord *,IN  EFI_IFR_TYPE_VALUE);\r
+\r
+private:\r
+  CIfrRecordInfoDB (IN CONST CIfrRecordInfoDB&);             // Prevent copy-construction\r
+  CIfrRecordInfoDB& operator= (IN CONST CIfrRecordInfoDB&);  // Prevent assignment\r
 };\r
 \r
 extern CIfrRecordInfoDB gCIfrRecordInfoDB;\r

diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
index 2e06e4f1672ce1925e47f4775c00b8b6cce24055..59509c3fcceb46ac9107f1ee01928883bc44b9e6 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
@@ -55,6 +55,10 @@ struct SConfigInfo {
 \r
   SConfigInfo (IN UINT8, IN UINT16, IN UINT32, IN EFI_IFR_TYPE_VALUE);\r
   ~SConfigInfo (VOID);\r
+\r
+private:\r
+  SConfigInfo (IN CONST SConfigInfo&);             // Prevent copy-construction\r
+  SConfigInfo& operator= (IN CONST SConfigInfo&);  // Prevent assignment\r
 };\r
 \r
 struct SConfigItem {\r
@@ -68,6 +72,10 @@ public:
   SConfigItem (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *);\r
   SConfigItem (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT16, IN EFI_IFR_TYPE_VALUE);\r
   virtual ~SConfigItem ();\r
+\r
+private:\r
+  SConfigItem (IN CONST SConfigItem&);             // Prevent copy-construction\r
+  SConfigItem& operator= (IN CONST SConfigItem&);  // Prevent assignment\r
 };\r
 \r
 class CVfrBufferConfig {\r
@@ -90,6 +98,10 @@ public:
 #endif\r
   virtual VOID    Close (VOID);\r
   virtual VOID    OutputCFile (IN FILE *, IN CHAR8 *);\r
+\r
+private:\r
+  CVfrBufferConfig (IN CONST CVfrBufferConfig&);             // Prevent copy-construction\r
+  CVfrBufferConfig& operator= (IN CONST CVfrBufferConfig&);  // Prevent assignment\r
 };\r
 \r
 extern CVfrBufferConfig gCVfrBufferConfig;\r
@@ -157,6 +169,10 @@ struct SVfrPackStackNode {
       return FALSE;\r
     }\r
   }\r
+\r
+private:\r
+  SVfrPackStackNode (IN CONST SVfrPackStackNode&);             // Prevent copy-construction\r
+  SVfrPackStackNode& operator= (IN CONST SVfrPackStackNode&);  // Prevent assignment\r
 };\r
 \r
 class CVfrVarDataTypeDB {\r
@@ -210,6 +226,10 @@ public:
 #ifdef CVFR_VARDATATYPEDB_DEBUG\r
   VOID ParserDB ();\r
 #endif\r
+\r
+private:\r
+  CVfrVarDataTypeDB (IN CONST CVfrVarDataTypeDB&);             // Prevent copy-construction\r
+  CVfrVarDataTypeDB& operator= (IN CONST CVfrVarDataTypeDB&);  // Prevent assignment\r
 };\r
 \r
 extern CVfrVarDataTypeDB  gCVfrVarDataTypeDB;\r
@@ -251,6 +271,10 @@ public:
   SVfrVarStorageNode (IN EFI_GUID *, IN CHAR8 *, IN EFI_VARSTORE_ID, IN SVfrDataType *, IN BOOLEAN Flag = TRUE);\r
   SVfrVarStorageNode (IN CHAR8 *, IN EFI_VARSTORE_ID);\r
   ~SVfrVarStorageNode (VOID);\r
+\r
+private:\r
+  SVfrVarStorageNode (IN CONST SVfrVarStorageNode&);             // Prevent copy-construction\r
+  SVfrVarStorageNode& operator= (IN CONST SVfrVarStorageNode&);  // Prevent assignment\r
 };\r
 \r
 struct EFI_VARSTORE_INFO {\r
@@ -332,6 +356,10 @@ public:
   EFI_VFR_RETURN_CODE GetNameVarStoreInfo (IN EFI_VARSTORE_INFO *, IN UINT32);\r
   EFI_VFR_RETURN_CODE AddBufferVarStoreFieldInfo (IN EFI_VARSTORE_INFO *);\r
   EFI_VFR_RETURN_CODE GetBufferVarStoreFieldInfo (IN OUT EFI_VARSTORE_INFO *);\r
+\r
+private:\r
+  CVfrDataStorage (IN CONST CVfrDataStorage&);             // Prevent copy-construction\r
+  CVfrDataStorage& operator= (IN CONST CVfrDataStorage&);  // Prevent assignment\r
 };\r
 \r
 extern CVfrDataStorage gCVfrDataStorage;\r
@@ -357,6 +385,10 @@ struct SVfrQuestionNode {
 \r
   SVfrQuestionNode (IN CHAR8 *, IN CHAR8 *, IN UINT32 BitMask = 0);\r
   ~SVfrQuestionNode ();\r
+\r
+private:\r
+  SVfrQuestionNode (IN CONST SVfrQuestionNode&);             // Prevent copy-construction\r
+  SVfrQuestionNode& operator= (IN CONST SVfrQuestionNode&);  // Prevent assignment\r
 };\r
 \r
 class CVfrQuestionDB {\r
@@ -390,6 +422,10 @@ public:
   VOID SetCompatibleMode (IN BOOLEAN Mode) {\r
     VfrCompatibleMode = Mode;\r
   }\r
+\r
+private:\r
+  CVfrQuestionDB (IN CONST CVfrQuestionDB&);             // Prevent copy-construction\r
+  CVfrQuestionDB& operator= (IN CONST CVfrQuestionDB&);  // Prevent assignment\r
 };\r
 \r
 struct SVfrDefaultStoreNode {\r
@@ -402,6 +438,10 @@ struct SVfrDefaultStoreNode {
 \r
   SVfrDefaultStoreNode (IN EFI_IFR_DEFAULTSTORE *, IN CHAR8 *, IN EFI_STRING_ID, IN UINT16);\r
   ~SVfrDefaultStoreNode();\r
+\r
+private:\r
+  SVfrDefaultStoreNode (IN CONST SVfrDefaultStoreNode&);             // Prevent copy-construction\r
+  SVfrDefaultStoreNode& operator= (IN CONST SVfrDefaultStoreNode&);  // Prevent assignment\r
 };\r
 \r
 class CVfrDefaultStore {\r
@@ -417,6 +457,10 @@ public:
   BOOLEAN             DefaultIdRegistered (IN UINT16);\r
   EFI_VFR_RETURN_CODE GetDefaultId (IN CHAR8 *, OUT UINT16 *);\r
   EFI_VFR_RETURN_CODE BufferVarStoreAltConfigAdd (IN EFI_VARSTORE_ID, IN EFI_VARSTORE_INFO &, IN CHAR8 *, IN EFI_GUID *, IN UINT8, IN EFI_IFR_TYPE_VALUE);\r
+\r
+private:\r
+  CVfrDefaultStore (IN CONST CVfrDefaultStore&);             // Prevent copy-construction\r
+  CVfrDefaultStore& operator= (IN CONST CVfrDefaultStore&);  // Prevent assignment\r
 };\r
 \r
 extern CVfrDefaultStore gCVfrDefaultStore;\r
@@ -431,6 +475,10 @@ struct SVfrRuleNode {
 \r
   SVfrRuleNode(IN CHAR8 *, IN UINT8);\r
   ~SVfrRuleNode();\r
+\r
+private:\r
+  SVfrRuleNode (IN CONST SVfrRuleNode&);             // Prevent copy-construction\r
+  SVfrRuleNode& operator= (IN CONST SVfrRuleNode&);  // Prevent assignment\r
 };\r
 \r
 class CVfrRulesDB {\r
@@ -444,6 +492,10 @@ public:
 \r
   VOID RegisterRule (IN CHAR8 *);\r
   UINT8 GetRuleId (IN CHAR8 *);\r
+\r
+private:\r
+  CVfrRulesDB (IN CONST CVfrRulesDB&);             // Prevent copy-construction\r
+  CVfrRulesDB& operator= (IN CONST CVfrRulesDB&);  // Prevent assignment\r
 };\r
 \r
 class CVfrStringDB {\r
@@ -478,6 +530,9 @@ public:
     IN EFI_STRING_ID StringId\r
     );\r
 \r
+private:\r
+  CVfrStringDB (IN CONST CVfrStringDB&);             // Prevent copy-construction\r
+  CVfrStringDB& operator= (IN CONST CVfrStringDB&);  // Prevent assignment\r
 };\r
 \r
 #endif\r