BaseTools/VfrCompile: Resolve uninit class variables in constructor

The commit initializes those possibly uninitialized class variables in
class constructors.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
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/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp
index 0f8f7dd891b3d8d6a2b1fe071c531e5d7719e4c6..2366fac5a760bb6565cd72b96f4effb91d3b466e 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp
@@ -67,6 +67,7 @@ CVfrErrorHandle::CVfrErrorHandle (
   mScopeRecordListTail   = NULL;\r
   mVfrErrorHandleTable   = VFR_ERROR_HANDLE_TABLE;\r
   mVfrWarningHandleTable = VFR_WARNING_HANDLE_TABLE;\r
   mScopeRecordListTail   = NULL;\r
   mVfrErrorHandleTable   = VFR_ERROR_HANDLE_TABLE;\r
   mVfrWarningHandleTable = VFR_WARNING_HANDLE_TABLE;\r

+  mWarningAsError        = FALSE;\r

 }\r
 \r
 CVfrErrorHandle::~CVfrErrorHandle (\r
 }\r
 \r
 CVfrErrorHandle::~CVfrErrorHandle (\r

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index b8350623f2a06f8c6f3dc6855f43bec5e3018448..0f0efd4c6d0b42912deefeed555fdf1c6f6a1b5e 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -104,8 +104,13 @@ CFormPkg::CFormPkg (
   SBufferNode *Node;\r
 \r
   mPkgLength           = 0;\r
   SBufferNode *Node;\r
 \r
   mPkgLength           = 0;\r

+  mBufferSize          = 0;\r

   mBufferNodeQueueHead = NULL;\r
   mBufferNodeQueueHead = NULL;\r

+  mBufferNodeQueueTail = NULL;\r

   mCurrBufferNode      = NULL;\r
   mCurrBufferNode      = NULL;\r

+  mReadBufferNode      = NULL;\r
+  mReadBufferOffset    = 0;\r
+  PendingAssignList    = NULL;\r

 \r
   Node = new SBufferNode;\r
   if (Node == NULL) {\r
 \r
   Node = new SBufferNode;\r
   if (Node == NULL) {\r


@@ -2421,6 +2426,7 @@ CIfrObj::CIfrObj (
   mObjBinLen   = (ObjBinLen == 0) ? gOpcodeSizesScopeTable[OpCode].mSize : ObjBinLen;\r
   mObjBinBuf   = ((DelayEmit == FALSE) && (gCreateOp == TRUE)) ? gCFormPkg.IfrBinBufferGet (mObjBinLen) : new CHAR8[EFI_IFR_MAX_LENGTH];\r
   mRecordIdx   = (gCreateOp == TRUE) ? gCIfrRecordInfoDB.IfrRecordRegister (0xFFFFFFFF, mObjBinBuf, mObjBinLen, mPkgOffset) : EFI_IFR_RECORDINFO_IDX_INVALUD;\r
   mObjBinLen   = (ObjBinLen == 0) ? gOpcodeSizesScopeTable[OpCode].mSize : ObjBinLen;\r
   mObjBinBuf   = ((DelayEmit == FALSE) && (gCreateOp == TRUE)) ? gCFormPkg.IfrBinBufferGet (mObjBinLen) : new CHAR8[EFI_IFR_MAX_LENGTH];\r
   mRecordIdx   = (gCreateOp == TRUE) ? gCIfrRecordInfoDB.IfrRecordRegister (0xFFFFFFFF, mObjBinBuf, mObjBinLen, mPkgOffset) : EFI_IFR_RECORDINFO_IDX_INVALUD;\r

+  mLineNo      = 0;\r

 \r
   assert (mObjBinBuf != NULL);\r
 \r
 \r
   assert (mObjBinBuf != NULL);\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
index 4866639aabe38573253293078406f046c8e481bc..c536498d771ec9852ece0a74dbb505c8e9bc6db1 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
@@ -958,6 +958,7 @@ CVfrVarDataTypeDB::CVfrVarDataTypeDB (
   mPackAlign     = DEFAULT_PACK_ALIGN;\r
   mPackStack     = NULL;\r
   mFirstNewDataTypeName = NULL;\r
   mPackAlign     = DEFAULT_PACK_ALIGN;\r
   mPackStack     = NULL;\r
   mFirstNewDataTypeName = NULL;\r

+  mCurrDataType  = NULL;\r

 \r
   InternalTypesListInit ();\r
 }\r
 \r
   InternalTypesListInit ();\r
 }\r


@@ -1605,6 +1606,7 @@ SVfrVarStorageNode::SVfrVarStorageNode (
   IN EFI_VARSTORE_ID       VarStoreId\r
   )\r
 {\r
   IN EFI_VARSTORE_ID       VarStoreId\r
   )\r
 {\r

+  memset (&mGuid, 0, sizeof (EFI_GUID));\r

   if (StoreName != NULL) {\r
     mVarStoreName = new CHAR8[strlen(StoreName) + 1];\r
     strcpy (mVarStoreName, StoreName);\r
   if (StoreName != NULL) {\r
     mVarStoreName = new CHAR8[strlen(StoreName) + 1];\r
     strcpy (mVarStoreName, StoreName);\r


@@ -1616,6 +1618,7 @@ SVfrVarStorageNode::SVfrVarStorageNode (
   mVarStoreType                      = EFI_VFR_VARSTORE_NAME;\r
   mStorageInfo.mNameSpace.mNameTable = new EFI_VARSTORE_ID[DEFAULT_NAME_TABLE_ITEMS];\r
   mStorageInfo.mNameSpace.mTableSize = 0;\r
   mVarStoreType                      = EFI_VFR_VARSTORE_NAME;\r
   mStorageInfo.mNameSpace.mNameTable = new EFI_VARSTORE_ID[DEFAULT_NAME_TABLE_ITEMS];\r
   mStorageInfo.mNameSpace.mTableSize = 0;\r

+  mAssignedFlag                      = FALSE;\r

 }\r
 \r
 SVfrVarStorageNode::~SVfrVarStorageNode (\r
 }\r
 \r
 SVfrVarStorageNode::~SVfrVarStorageNode (\r