summaryrefslogtreecommitdiff
path: root/MdeModulePkg
diff options
context:
space:
mode:
authorDandan Bi <dandan.bi@intel.com>2015-08-13 00:58:56 +0000
committerdandanbi <dandanbi@Edk2>2015-08-13 00:58:56 +0000
commited5d1532f9f04fd7e463920787cc4209f72f7602 (patch)
tree9ae6bb92e71b43f8649958cd626dbda43ab8a880 /MdeModulePkg
parentfa6c39dbfb896f2bd32942d6bcd998725a4516c7 (diff)
downloadedk2-platforms-ed5d1532f9f04fd7e463920787cc4209f72f7602.tar.xz
MdeModulePkg: Refine the code in UiApp
Refine the code in UiApp to prevent the potential risk. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi <dandan.bi@intel.com> Reviewed-by: Qiu Shumin <shumin.qiu@intel.com> Reviewed-by: Eric Dong <eric.dong@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18216 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
-rw-r--r--MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c1
-rw-r--r--MdeModulePkg/Application/UiApp/BootMaint/Variable.c12
2 files changed, 10 insertions, 3 deletions
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c b/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c
index b459fba5bb..e2e6b0335b 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c
@@ -258,7 +258,6 @@ FileExplorerCallback (
Status = EFI_SUCCESS;
Private = FE_CALLBACK_DATA_FROM_THIS (This);
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;
//
// Retrieve uncommitted data from Form Browser
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c b/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
index 4fe8c534eb..8c10540854 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
@@ -524,6 +524,7 @@ Var_UpdateErrorOutOption (
@retval EFI_OUT_OF_RESOURCES If not enought memory to complete the operation.
@retval EFI_SUCCESS If function completes successfully.
+ @return Others Errors Return errors from call to gRT->GetVariable.
**/
EFI_STATUS
@@ -659,7 +660,10 @@ Var_UpdateDriverOption (
Buffer
);
ASSERT_EFI_ERROR (Status);
- GetEfiGlobalVariable2 (L"DriverOrder", (VOID **) &DriverOrderList, &DriverOrderListSize);
+ Status = GetEfiGlobalVariable2 (L"DriverOrder", (VOID **) &DriverOrderList, &DriverOrderListSize);
+ if (EFI_ERROR (Status) || DriverOrderList == NULL){
+ return Status;
+ }
NewDriverOrderList = AllocateZeroPool (DriverOrderListSize + sizeof (UINT16));
ASSERT (NewDriverOrderList != NULL);
CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);
@@ -700,6 +704,7 @@ Var_UpdateDriverOption (
@retval EFI_OUT_OF_RESOURCES If not enought memory to complete the operation.
@retval EFI_SUCCESS If function completes successfully.
+ @return Others Errors Return errors from call to gRT->GetVariable.
**/
EFI_STATUS
@@ -824,7 +829,10 @@ Var_UpdateBootOption (
);
ASSERT_EFI_ERROR (Status);
- GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrderList, &BootOrderListSize);
+ Status = GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrderList, &BootOrderListSize);
+ if (EFI_ERROR (Status) || BootOrderList == NULL){
+ return Status;
+ }
NewBootOrderList = AllocateZeroPool (BootOrderListSize + sizeof (UINT16));
ASSERT (NewBootOrderList != NULL);
CopyMem (NewBootOrderList, BootOrderList, BootOrderListSize);