Remove SafeFreePool from MemoryAllocationLib as this API's name is misleading. Its...

[mirror_edk2.git] / MdeModulePkg / Universal / BdsDxe / BootMaint / Variable.c

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index b97af5cd296b99b50a9ba90f8888240fb34b319f..622093c8bb4912c807bd10987b11fb3de54ba43f 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -122,7 +122,7 @@ Var_ChangeBootOrder (
   //\r
   if (BootOrderList != NULL) {\r
     EfiLibDeleteVariable (L"BootOrder", &gEfiGlobalVariableGuid);\r
-    SafeFreePool (BootOrderList);\r
+    FreePool (BootOrderList);\r
     BootOrderList = NULL;\r
   }\r
   //\r
@@ -268,7 +268,7 @@ Var_ChangeDriverOrder (
   //\r
   if (DriverOrderList != NULL) {\r
     EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
-    SafeFreePool (DriverOrderList);\r
+    FreePool (DriverOrderList);\r
     DriverOrderList = NULL;\r
   }\r
 \r
@@ -407,7 +407,7 @@ Var_UpdateConsoleOption (
   ConDevicePath = EfiLibGetVariable (ConsoleName, &gEfiGlobalVariableGuid);\r
   if (ConDevicePath != NULL) {\r
     EfiLibDeleteVariable (ConsoleName, &gEfiGlobalVariableGuid);\r
-    SafeFreePool (ConDevicePath);\r
+    FreePool (ConDevicePath);\r
     ConDevicePath = NULL;\r
   };\r
 \r
@@ -689,10 +689,11 @@ Var_UpdateDriverOption (
                   NewDriverOrderList\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
-  SafeFreePool (DriverOrderList);\r
+  if (DriverOrderList != NULL) {\r
+    FreePool (DriverOrderList);\r
+  }\r
   DriverOrderList = NULL;\r
-  SafeFreePool (NewDriverOrderList);\r
-  NewDriverOrderList = NULL;\r
+  FreePool (NewDriverOrderList);\r
   InsertTailList (&DriverOptionMenu.Head, &NewMenuEntry->Link);\r
   DriverOptionMenu.MenuNumber++;\r
 \r
@@ -849,6 +850,7 @@ Var_UpdateBootOption (
 \r
   if (BootOrderList != NULL) {\r
     EfiLibDeleteVariable (L"BootOrder", &gEfiGlobalVariableGuid);\r
+    FreePool (BootOrderList);\r
   }\r
 \r
   Status = gRT->SetVariable (\r
@@ -860,9 +862,7 @@ Var_UpdateBootOption (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  SafeFreePool (BootOrderList);\r
-  BootOrderList = NULL;\r
-  SafeFreePool (NewBootOrderList);\r
+  FreePool (NewBootOrderList);\r
   NewBootOrderList = NULL;\r
   InsertTailList (&BootOptionMenu.Head, &NewMenuEntry->Link);\r
   BootOptionMenu.MenuNumber++;\r
@@ -976,6 +976,7 @@ Var_UpdateBootOrder (
   //\r
   if (BootOrderList != NULL) {\r
     EfiLibDeleteVariable (L"BootOrder", &gEfiGlobalVariableGuid);\r
+    FreePool (BootOrderList);\r
   }\r
 \r
   for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
@@ -989,8 +990,7 @@ Var_UpdateBootOrder (
                   BootOrderListSize,\r
                   NewBootOrderList\r
                   );\r
-  SafeFreePool (BootOrderList);\r
-  SafeFreePool (NewBootOrderList);\r
+  FreePool (NewBootOrderList);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1048,6 +1048,7 @@ Var_UpdateDriverOrder (
   //\r
   if (DriverOrderList != NULL) {\r
     EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
+    FreePool (DriverOrderList);\r
   }\r
 \r
   for (Index = 0; Index < DriverOrderListSize; Index++) {\r
@@ -1065,8 +1066,6 @@ Var_UpdateDriverOrder (
     return Status;\r
   }\r
 \r
-  SafeFreePool (DriverOrderList);\r
-\r
   BOpt_FreeMenu (&DriverOptionMenu);\r
   BOpt_GetDriverOptions (CallbackData);\r
   return EFI_SUCCESS;\r
@@ -1190,13 +1189,13 @@ Var_UpdateBBSOption (
   }\r
 \r
   if (VarData >= VarData + VarSize) {\r
-    SafeFreePool (OriginalPtr);\r
+    FreePool (OriginalPtr);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   NewOrder = (UINT16 *) AllocateZeroPool (DevOrder->Length - sizeof (UINT16));\r
   if (NULL == NewOrder) {\r
-    SafeFreePool (VarData);\r
+    FreePool (VarData);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -1229,7 +1228,7 @@ Var_UpdateBBSOption (
     NewOrder,\r
     DevOrder->Length - sizeof (UINT16)\r
     );\r
-  SafeFreePool (NewOrder);\r
+  FreePool (NewOrder);\r
 \r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
@@ -1239,7 +1238,7 @@ Var_UpdateBBSOption (
                   OriginalPtr\r
                   );\r
 \r
-  SafeFreePool (OriginalPtr);\r
+  FreePool (OriginalPtr);\r
 \r
   //\r
   // Update Optional Data of Boot####\r
@@ -1371,8 +1370,8 @@ Var_UpdateBBSOption (
                     NewOptionPtr\r
                     );\r
 \r
-    SafeFreePool (NewOptionPtr);\r
-    SafeFreePool (BootOptionVar);\r
+    FreePool (NewOptionPtr);\r
+    FreePool (BootOptionVar);\r
   }\r
 \r
   BOpt_GetBootOptions (CallbackData);\r