MdeModulePkg: Refine the code in UiApp

[mirror_edk2.git] / MdeModulePkg / Application / UiApp / BootMaint / Variable.c

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c b/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
index 4fe8c534eb073496a0d32a9a8b2bdab7c99e1794..8c10540854f02023b0869b67b814dd464b63f70c 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
@@ -524,6 +524,7 @@ Var_UpdateErrorOutOption (
 \r
   @retval EFI_OUT_OF_RESOURCES If not enought memory to complete the operation.\r
   @retval EFI_SUCCESS          If function completes successfully.\r
+  @return Others Errors        Return errors from call to gRT->GetVariable.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -659,7 +660,10 @@ Var_UpdateDriverOption (
                   Buffer\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
-  GetEfiGlobalVariable2 (L"DriverOrder", (VOID **) &DriverOrderList, &DriverOrderListSize);\r
+  Status = GetEfiGlobalVariable2 (L"DriverOrder", (VOID **) &DriverOrderList, &DriverOrderListSize);\r
+  if (EFI_ERROR (Status) || DriverOrderList == NULL){\r
+    return Status;\r
+  }\r
   NewDriverOrderList = AllocateZeroPool (DriverOrderListSize + sizeof (UINT16));\r
   ASSERT (NewDriverOrderList != NULL);\r
   CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
@@ -700,6 +704,7 @@ Var_UpdateDriverOption (
 \r
   @retval EFI_OUT_OF_RESOURCES If not enought memory to complete the operation.\r
   @retval EFI_SUCCESS          If function completes successfully.\r
+  @return Others Errors        Return errors from call to gRT->GetVariable.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -824,7 +829,10 @@ Var_UpdateBootOption (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrderList, &BootOrderListSize);\r
+  Status = GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrderList, &BootOrderListSize);\r
+  if (EFI_ERROR (Status) || BootOrderList == NULL){\r
+    return Status;\r
+  }\r
   NewBootOrderList = AllocateZeroPool (BootOrderListSize + sizeof (UINT16));\r
   ASSERT (NewBootOrderList != NULL);\r
   CopyMem (NewBootOrderList, BootOrderList, BootOrderListSize);\r