summaryrefslogtreecommitdiff
path: root/IntelFrameworkModulePkg/Universal
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2014-06-25 06:51:36 +0000
committerydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>2014-06-25 06:51:36 +0000
commit45295cf5a58578b84e5092c3a3dd145c069c1db5 (patch)
tree8f1e0d94227e6f450de1d7ececf04a1f346225a4 /IntelFrameworkModulePkg/Universal
parent79ecd2dbfa41c6e121eaf320689caf01d331a91c (diff)
downloadedk2-platforms-45295cf5a58578b84e5092c3a3dd145c069c1db5.tar.xz
Refine code to make it more safely.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Jeff Fan <jeff.fan@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15592 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg/Universal')
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c9
-rw-r--r--IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c3
2 files changed, 5 insertions, 7 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 591f884a94..e1a53135b5 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1740,17 +1740,14 @@ GetLegacyDeviceOrder (
LegacyOrder = CallbackData->BmmFakeNvData.LegacyNET;
OldData = CallbackData->BmmOldFakeNVData.LegacyNET;
break;
-
- case FORM_SET_BEV_ORDER_ID:
+
+ default:
+ ASSERT (PageIdList[Index] == FORM_SET_BEV_ORDER_ID);
OptionMenu = (BM_MENU_OPTION *) &LegacyBEVMenu;
BbsType = BBS_BEV_DEVICE;
LegacyOrder = CallbackData->BmmFakeNvData.LegacyBEV;
OldData = CallbackData->BmmOldFakeNVData.LegacyBEV;
break;
-
- default:
- DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));
- break;
}
if (NULL != VarData) {
diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c
index 99b8d3c358..e1f1b023dc 100644
--- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c
+++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c
@@ -3,7 +3,7 @@
for the image to be programmed, and the flash area that is going to be
programed.
- Copyright (c) 2002 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2002 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -755,6 +755,7 @@ InitializeUpdateDriver (
if (EFI_ERROR (Status)) {
return Status;
}
+ ASSERT (ConfigData != NULL);
//
// Now find the update image. The update image should be put in a FV, and then