mirror of https://github.com/acidanthera/audk.git
1.enhanced security check.
2.remove un-necessary ASSERT. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7522 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
8f0dd97eab
commit
7174e04c2b
|
@ -1009,7 +1009,7 @@ ConstructConfigHdr (
|
||||||
// | 5 | 32 | 6 | NameStrLen*4 | 6 | DevicePathStrLen | 1 |
|
// | 5 | 32 | 6 | NameStrLen*4 | 6 | DevicePathStrLen | 1 |
|
||||||
//
|
//
|
||||||
BufferSize = (5 + 32 + 6 + NameStrLen * 4 + 6 + DevicePathSize * 2 + 1) * sizeof (CHAR16);
|
BufferSize = (5 + 32 + 6 + NameStrLen * 4 + 6 + DevicePathSize * 2 + 1) * sizeof (CHAR16);
|
||||||
if (*StrBufferLen < BufferSize) {
|
if ((*StrBufferLen == 0) || *StrBufferLen < BufferSize) {
|
||||||
*StrBufferLen = BufferSize;
|
*StrBufferLen = BufferSize;
|
||||||
return EFI_BUFFER_TOO_SMALL;
|
return EFI_BUFFER_TOO_SMALL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -762,7 +762,7 @@ SetWorker (
|
||||||
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);
|
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);
|
||||||
|
|
||||||
StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :
|
StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :
|
||||||
&mPcdDatabase->DxeDb.Init.StringTable[0]);
|
&mPcdDatabase->DxeDb.Init.StringTable[0]);
|
||||||
|
|
||||||
InternalData = PcdDb + Offset;
|
InternalData = PcdDb + Offset;
|
||||||
|
|
||||||
|
@ -789,8 +789,8 @@ SetWorker (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GuidTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :
|
GuidTable = (EFI_GUID *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.GuidTable[0] :
|
||||||
mPcdDatabase->DxeDb.Init.GuidTable;
|
&mPcdDatabase->DxeDb.Init.GuidTable[0]);
|
||||||
|
|
||||||
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);
|
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);
|
||||||
|
|
||||||
|
|
|
@ -928,7 +928,6 @@ UpdatePrioritySelectPage (
|
||||||
// Check the driver DriverImage's order number in mapping database
|
// Check the driver DriverImage's order number in mapping database
|
||||||
//
|
//
|
||||||
DriverImageNO = 0;
|
DriverImageNO = 0;
|
||||||
ASSERT (mSelectedCtrIndex < MAX_CHOICE_NUM);
|
|
||||||
CheckMapping (
|
CheckMapping (
|
||||||
mControllerDevicePathProtocol[mSelectedCtrIndex],
|
mControllerDevicePathProtocol[mSelectedCtrIndex],
|
||||||
LoadedImageDevicePath,
|
LoadedImageDevicePath,
|
||||||
|
@ -1029,7 +1028,6 @@ CommintChanges (
|
||||||
// Following code will be run if user select 'commint changes' in third page
|
// Following code will be run if user select 'commint changes' in third page
|
||||||
// user enter 'Commit Changes' to save the mapping database
|
// user enter 'Commit Changes' to save the mapping database
|
||||||
//
|
//
|
||||||
ASSERT (mSelectedCtrIndex < MAX_CHOICE_NUM);
|
|
||||||
DeleteDriverImage (mControllerDevicePathProtocol[mSelectedCtrIndex], NULL, &mMappingDataBase);
|
DeleteDriverImage (mControllerDevicePathProtocol[mSelectedCtrIndex], NULL, &mMappingDataBase);
|
||||||
for (SelectedDriverImageNum = 0; SelectedDriverImageNum < mSelectedDriverImageNum; SelectedDriverImageNum++) {
|
for (SelectedDriverImageNum = 0; SelectedDriverImageNum < mSelectedDriverImageNum; SelectedDriverImageNum++) {
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in New Issue