tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hao Wu 2016-09-27 13:43:32 +08:00
parent 0d46defefa
commit 77dee0b185
4 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseTools/Source/C/VfrCompile/Pccts/h/DLexerBase.h
View File

@ -119,6 +119,9 @@ public:
/* user must subclass this */
class DllExportPCCTS DLGLexerBase : public ANTLRTokenStream {
private:
DLGLexerBase(const DLGLexerBase&); // Prevent copy-construction
DLGLexerBase& operator=(const DLGLexerBase&); // Prevent assignment
public:
virtual ANTLRTokenType erraction();

10
BaseTools/Source/C/VfrCompile/VfrError.h
View File

@ -2,7 +2,7 @@
VfrCompiler Error definition
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -73,6 +73,10 @@ struct SVfrFileScopeRecord {
SVfrFileScopeRecord (IN CHAR8 *, IN UINT32);
~SVfrFileScopeRecord();
private:
SVfrFileScopeRecord (IN CONST SVfrFileScopeRecord&); // Prevent copy-construction
SVfrFileScopeRecord& operator= (IN CONST SVfrFileScopeRecord&); // Prevent assignment
};
class CVfrErrorHandle {
@ -95,6 +99,10 @@ public:
UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);
UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);
VOID PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = "");
private:
CVfrErrorHandle (IN CONST CVfrErrorHandle&); // Prevent copy-construction
CVfrErrorHandle& operator= (IN CONST CVfrErrorHandle&); // Prevent assignment
};
#define CHECK_ERROR_RETURN(f, v) do { EFI_VFR_RETURN_CODE r; if ((r = (f)) != (v)) { return r; } } while (0)

12
BaseTools/Source/C/VfrCompile/VfrFormPkg.h
View File

@ -87,6 +87,10 @@ struct SPendingAssign {
VOID SetAddrAndLen (IN VOID *, IN UINT32);
VOID AssignValue (IN VOID *, IN UINT32);
CHAR8 * GetKey (VOID);
private:
SPendingAssign (IN CONST SPendingAssign&); // Prevent copy-construction
SPendingAssign& operator= (IN CONST SPendingAssign&); // Prevent assignment
};
struct SBufferNode {
@ -139,6 +143,10 @@ public:
EFI_VFR_RETURN_CODE BuildPkg (OUT PACKAGE_DATA &);
EFI_VFR_RETURN_CODE GenCFile (IN CHAR8 *, IN FILE *, IN PACKAGE_DATA *PkgData = NULL);
private:
CFormPkg (IN CONST CFormPkg&); // Prevent copy-construction
CFormPkg& operator= (IN CONST CFormPkg&); // Prevent assignment
public:
EFI_VFR_RETURN_CODE AssignPending (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CONST CHAR8 *Msg = NULL);
VOID DoPendingAssign (IN CHAR8 *, IN VOID *, IN UINT32);
@ -237,6 +245,10 @@ public:
VOID IfrCreateDefaultForQuestion (IN SIfrRecord *, IN QuestionDefaultRecord *);
VOID IfrParseDefaulInfoInQuestion (IN SIfrRecord *, OUT QuestionDefaultRecord *);
VOID IfrAddDefaultToBufferConfig (IN UINT16, IN SIfrRecord *,IN EFI_IFR_TYPE_VALUE);
private:
CIfrRecordInfoDB (IN CONST CIfrRecordInfoDB&); // Prevent copy-construction
CIfrRecordInfoDB& operator= (IN CONST CIfrRecordInfoDB&); // Prevent assignment
};
extern CIfrRecordInfoDB gCIfrRecordInfoDB;

55
BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
View File

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