diff options
3 files changed, 4 insertions, 6 deletions
diff --git a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c index 3feaf92958..9e6d3382f7 100644 --- a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c +++ b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c @@ -1009,7 +1009,7 @@ ConstructConfigHdr ( // | 5 | 32 | 6 | NameStrLen*4 | 6 | DevicePathStrLen | 1 |
//
BufferSize = (5 + 32 + 6 + NameStrLen * 4 + 6 + DevicePathSize * 2 + 1) * sizeof (CHAR16);
- if (*StrBufferLen < BufferSize) {
+ if ((*StrBufferLen == 0) || *StrBufferLen < BufferSize) {
*StrBufferLen = BufferSize;
return EFI_BUFFER_TOO_SMALL;
}
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c index 977db39d42..9ef83ef658 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Service.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c @@ -762,7 +762,7 @@ SetWorker ( PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);
StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :
- &mPcdDatabase->DxeDb.Init.StringTable[0]);
+ &mPcdDatabase->DxeDb.Init.StringTable[0]);
InternalData = PcdDb + Offset;
@@ -789,8 +789,8 @@ SetWorker ( }
}
- GuidTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :
- mPcdDatabase->DxeDb.Init.GuidTable;
+ GuidTable = (EFI_GUID *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.GuidTable[0] :
+ &mPcdDatabase->DxeDb.Init.GuidTable[0]);
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);
diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c index 86c1891668..b7f790c937 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c +++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c @@ -928,7 +928,6 @@ UpdatePrioritySelectPage ( // Check the driver DriverImage's order number in mapping database
//
DriverImageNO = 0;
- ASSERT (mSelectedCtrIndex < MAX_CHOICE_NUM);
CheckMapping (
mControllerDevicePathProtocol[mSelectedCtrIndex],
LoadedImageDevicePath,
@@ -1029,7 +1028,6 @@ CommintChanges ( // Following code will be run if user select 'commint changes' in third page
// user enter 'Commit Changes' to save the mapping database
//
- ASSERT (mSelectedCtrIndex < MAX_CHOICE_NUM);
DeleteDriverImage (mControllerDevicePathProtocol[mSelectedCtrIndex], NULL, &mMappingDataBase);
for (SelectedDriverImageNum = 0; SelectedDriverImageNum < mSelectedDriverImageNum; SelectedDriverImageNum++) {
//
|