\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
\r
#include "stdio.h"\r
#include "stdlib.h"\r
+#include "assert.h"\r
#include "CommonLib.h"\r
#include "VfrUtilityLib.h"\r
#include "VfrFormPkg.h"\r
\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
for (Index = 0; gInternalTypesTable[Index].mTypeName != NULL; Index++) {\r
New = new SVfrDataType;\r
if (New != NULL) {\r
- strcpy (New->mTypeName, gInternalTypesTable[Index].mTypeName);\r
+ assert (strlen (gInternalTypesTable[Index].mTypeName) < MAX_NAME_LEN);\r
+ strncpy (New->mTypeName, gInternalTypesTable[Index].mTypeName, MAX_NAME_LEN - 1);\r
+ New->mTypeName[MAX_NAME_LEN - 1] = 0;\r
New->mType = gInternalTypesTable[Index].mType;\r
New->mAlign = gInternalTypesTable[Index].mAlign;\r
New->mTotalSize = gInternalTypesTable[Index].mSize;\r
mPackAlign = DEFAULT_PACK_ALIGN;\r
mPackStack = NULL;\r
mFirstNewDataTypeName = NULL;\r
+ mCurrDataType = NULL;\r
\r
InternalTypesListInit ();\r
}\r
}\r
}\r
\r
- strcpy(mNewDataType->mTypeName, TypeName);\r
+ strncpy(mNewDataType->mTypeName, TypeName, MAX_NAME_LEN - 1);\r
+ mNewDataType->mTypeName[MAX_NAME_LEN - 1] = 0;\r
return VFR_RETURN_SUCCESS;\r
}\r
\r
\r
MaxDataTypeSize = mNewDataType->mTotalSize;\r
if (FieldName != NULL) {\r
- strcpy (pNewField->mFieldName, FieldName);\r
+ strncpy (pNewField->mFieldName, FieldName, MAX_NAME_LEN - 1);\r
+ pNewField->mFieldName[MAX_NAME_LEN - 1] = 0;\r
}\r
pNewField->mFieldType = pFieldType;\r
pNewField->mIsBitField = TRUE;\r
if ((pNewField = new SVfrDataField) == NULL) {\r
return VFR_RETURN_OUT_FOR_RESOURCES;\r
}\r
- strcpy (pNewField->mFieldName, FieldName);\r
+ strncpy (pNewField->mFieldName, FieldName, MAX_NAME_LEN - 1);\r
+ pNewField->mFieldName[MAX_NAME_LEN - 1] = 0;\r
pNewField->mFieldType = pFieldType;\r
pNewField->mArrayNum = ArrayNum;\r
pNewField->mIsBitField = FALSE;\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
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
if (mVarStoreType == EFI_VFR_VARSTORE_NAME) {\r
- delete mStorageInfo.mNameSpace.mNameTable;\r
+ delete[] mStorageInfo.mNameSpace.mNameTable;\r
}\r
}\r
\r
CVfrStringDB::~CVfrStringDB ()\r
{\r
if (mStringFileName != NULL) {\r
- delete mStringFileName;\r
+ delete[] mStringFileName;\r
}\r
mStringFileName = NULL;\r
}\r
return;\r
}\r
\r
+ if (mStringFileName != NULL) {\r
+ delete[] mStringFileName;\r
+ }\r
+\r
FileLen = strlen (StringFileName) + 1;\r
mStringFileName = new CHAR8[FileLen];\r
if (mStringFileName == NULL) {\r