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

It is recommended that module writer should keep track how a pointer is allocated and free it after use.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6306 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index d2bac53a529503284bf8b95095a5d22cd0624c06..b608f65367a17bb9616ddb1eac8eda8cda0f0c2e 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -651,7 +651,9 @@ ReleaseKeyboardLayoutResources (
   USB_NS_KEY      *UsbNsKey;\r
   LIST_ENTRY      *Link;\r
 \r
-  SafeFreePool (UsbKeyboardDevice->KeyConvertionTable);\r
+  if (UsbKeyboardDevice->KeyConvertionTable != NULL) {\r
+    FreePool (UsbKeyboardDevice->KeyConvertionTable);\r
+  }\r
   UsbKeyboardDevice->KeyConvertionTable = NULL;\r
 \r
   while (!IsListEmpty (&UsbKeyboardDevice->NsKeyList)) {\r
@@ -659,8 +661,8 @@ ReleaseKeyboardLayoutResources (
     UsbNsKey = USB_NS_KEY_FORM_FROM_LINK (Link);\r
     RemoveEntryList (&UsbNsKey->Link);\r
 \r
-    gBS->FreePool (UsbNsKey->NsKey);\r
-    gBS->FreePool (UsbNsKey);\r
+    FreePool (UsbNsKey->NsKey);\r
+    FreePool (UsbNsKey);\r
   }\r
 }\r
 \r

diff --git a/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c b/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c
index 8a7c0d7ad68139ea4d005e77d9e61e62ee70fe1c..c8b2c59f5244e08ebbeeb5bc07119447c1225c6a 100644 (file)
--- a/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -173,7 +173,7 @@ BdsLibBootViaBootOption (
   Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gEfiShellFileGuid);\r
   if (!EFI_ERROR(Status)) {\r
     if (Option->DevicePath != NULL) {\r
-      SafeFreePool(Option->DevicePath);\r
+      FreePool(Option->DevicePath);\r
     }\r
     Option->DevicePath  = AllocateZeroPool (GetDevicePathSize (DevicePath));\r
     CopyMem (Option->DevicePath, DevicePath, GetDevicePathSize (DevicePath));\r
@@ -186,7 +186,7 @@ BdsLibBootViaBootOption (
     //\r
     // free the temporary device path created by BdsLibUpdateFvFileDevicePath()\r
     //\r
-    SafeFreePool (DevicePath); \r
+    FreePool (DevicePath); \r
     DevicePath = Option->DevicePath;\r
   }\r
 \r
@@ -358,7 +358,7 @@ BdsExpandPartitionPartialDevicePathToFull (
       // Come here means the first instance is not matched\r
       //\r
       NeedAdjust = TRUE;\r
-      SafeFreePool(Instance);\r
+      FreePool(Instance);\r
     } while (TempNewDevicePath != NULL);\r
 \r
     if (DeviceExist) {\r
@@ -378,14 +378,14 @@ BdsExpandPartitionPartialDevicePathToFull (
         //\r
         TempNewDevicePath = CachedDevicePath;\r
         CachedDevicePath  = BdsLibDelPartMatchInstance (CachedDevicePath, Instance );\r
-        SafeFreePool (TempNewDevicePath);\r
+        FreePool (TempNewDevicePath);\r
         \r
         //\r
         // Second, append the remaining parth after the matched instance\r
         //\r
         TempNewDevicePath = CachedDevicePath;\r
         CachedDevicePath = AppendDevicePathInstance (Instance, CachedDevicePath );\r
-        SafeFreePool (TempNewDevicePath);\r
+        FreePool (TempNewDevicePath);\r
         //\r
         // Save the matching Device Path so we don't need to do a connect all next time\r
         //\r
@@ -398,8 +398,8 @@ BdsExpandPartitionPartialDevicePathToFull (
                         );\r
       }\r
       \r
-      SafeFreePool (Instance);\r
-      SafeFreePool (CachedDevicePath);\r
+      FreePool (Instance);\r
+      FreePool (CachedDevicePath);\r
       return FullDevicePath;\r
     }\r
   }\r
@@ -444,15 +444,15 @@ BdsExpandPartitionPartialDevicePathToFull (
         if (BdsLibMatchDevicePaths (CachedDevicePath, BlockIoDevicePath)) {\r
           TempNewDevicePath = CachedDevicePath;\r
           CachedDevicePath = BdsLibDelPartMatchInstance (CachedDevicePath, BlockIoDevicePath);\r
-          SafeFreePool(TempNewDevicePath);\r
+          FreePool(TempNewDevicePath);\r
 \r
           TempNewDevicePath = CachedDevicePath;\r
           CachedDevicePath = AppendDevicePathInstance (BlockIoDevicePath, CachedDevicePath);\r
-          SafeFreePool(TempNewDevicePath);\r
+          FreePool(TempNewDevicePath);\r
         } else {\r
           TempNewDevicePath = CachedDevicePath;\r
           CachedDevicePath = AppendDevicePathInstance (BlockIoDevicePath, CachedDevicePath);\r
-          SafeFreePool(TempNewDevicePath);\r
+          FreePool(TempNewDevicePath);\r
         }\r
         //\r
         // Here limit the device path instance number to 12, which is max number for a system support 3 IDE controller\r
@@ -496,8 +496,10 @@ BdsExpandPartitionPartialDevicePathToFull (
     }\r
   }\r
   \r
-  SafeFreePool (CachedDevicePath);\r
-  SafeFreePool (BlockIoBuffer);\r
+  FreePool (CachedDevicePath);\r
+  if (BlockIoBuffer != NULL) {\r
+    FreePool (BlockIoBuffer);\r
+  }\r
   return FullDevicePath;\r
 }\r
 \r
@@ -649,7 +651,7 @@ BdsLibDeleteOptionFromHandle (
                       );\r
                       \r
     if (BootOptionVar == NULL) {\r
-      SafeFreePool (BootOrder);\r
+      FreePool (BootOrder);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -665,11 +667,11 @@ BdsLibDeleteOptionFromHandle (
     if ((OptionDevicePathSize == DevicePathSize) &&\r
         (CompareMem (DevicePath, OptionDevicePath, DevicePathSize) == 0)) {\r
       BdsDeleteBootOption (BootOrder[Index], BootOrder, &BootOrderSize);\r
-      SafeFreePool (BootOptionVar);\r
+      FreePool (BootOptionVar);\r
       break;\r
     }\r
 \r
-    SafeFreePool (BootOptionVar);\r
+    FreePool (BootOptionVar);\r
     Index++;\r
   }\r
 \r
@@ -684,7 +686,7 @@ BdsLibDeleteOptionFromHandle (
                   BootOrder\r
                   );\r
 \r
-  SafeFreePool (BootOrder);\r
+  FreePool (BootOrder);\r
 \r
   return Status;\r
 }\r
@@ -741,7 +743,7 @@ BdsDeleteAllInvalidEfiBootOption (
                       &BootOptionSize\r
                       );\r
     if (NULL == BootOptionVar) {\r
-      SafeFreePool (BootOrder);\r
+      FreePool (BootOrder);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -755,7 +757,7 @@ BdsDeleteAllInvalidEfiBootOption (
     //\r
     if ((DevicePathType (OptionDevicePath) == BBS_DEVICE_PATH) &&\r
         (DevicePathSubType (OptionDevicePath) == BBS_BBS_DP)) {\r
-      SafeFreePool (BootOptionVar);\r
+      FreePool (BootOptionVar);\r
       Index++;\r
       continue;\r
     }\r
@@ -777,7 +779,7 @@ BdsDeleteAllInvalidEfiBootOption (
       BootOrder[Index] = 0xffff;\r
     }\r
 \r
-    SafeFreePool (BootOptionVar);\r
+    FreePool (BootOptionVar);\r
     Index++;\r
   }\r
 \r
@@ -799,7 +801,7 @@ BdsDeleteAllInvalidEfiBootOption (
                   BootOrder\r
                   );\r
 \r
-  SafeFreePool (BootOrder);\r
+  FreePool (BootOrder);\r
 \r
   return Status;\r
 }\r
@@ -963,7 +965,7 @@ BdsLibEnumerateAllBootOption (
   }\r
 \r
   if (NumberBlockIoHandles != 0) {\r
-    SafeFreePool (BlockIoHandles);\r
+    FreePool (BlockIoHandles);\r
   }\r
 \r
   //\r
@@ -1025,7 +1027,7 @@ BdsLibEnumerateAllBootOption (
   }\r
 \r
   if (NumberFileSystemHandles != 0) {\r
-    SafeFreePool (FileSystemHandles);\r
+    FreePool (FileSystemHandles);\r
   }\r
 \r
   //\r
@@ -1048,7 +1050,7 @@ BdsLibEnumerateAllBootOption (
   }\r
 \r
   if (NumberSimpleNetworkHandles != 0) {\r
-    SafeFreePool (SimpleNetworkHandles);\r
+    FreePool (SimpleNetworkHandles);\r
   }\r
 \r
   //\r
@@ -1102,7 +1104,7 @@ BdsLibEnumerateAllBootOption (
   }\r
 \r
   if (FvHandleCount != 0) {\r
-    SafeFreePool (FvHandleBuffer);\r
+    FreePool (FvHandleBuffer);\r
   }\r
   //\r
   // Make sure every boot only have one time\r
@@ -1307,7 +1309,7 @@ BdsLibGetBootableHandle (
                BlockIo->Media->BlockSize,\r
                Buffer\r
                );\r
-      SafeFreePool(Buffer);\r
+      FreePool(Buffer);\r
     }\r
   }\r
 \r
@@ -1320,6 +1322,8 @@ BdsLibGetBootableHandle (
   // Try to locate the USB node device path first, if fail then use its previour PCI node to search\r
   //\r
   DupDevicePath = DuplicateDevicePath (DevicePath);\r
+  ASSERT (DupDevicePath != NULL);\r
+  \r
   UpdatedDevicePath = DupDevicePath;\r
   Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);\r
   //\r
@@ -1379,9 +1383,11 @@ BdsLibGetBootableHandle (
     }\r
   }\r
 \r
-  SafeFreePool(DupDevicePath);\r
+  FreePool(DupDevicePath);\r
 \r
-  SafeFreePool(SimpleFileSystemHandles);\r
+  if (SimpleFileSystemHandles != NULL) {\r
+    FreePool(SimpleFileSystemHandles);\r
+  }\r
 \r
   return ReturnHandle;\r
 }\r
@@ -1640,7 +1646,7 @@ BdsLibIsValidEFIBootOptDevicePath (
       return TRUE;\r
     } else {\r
       if (Status == EFI_SUCCESS) {\r
-        SafeFreePool (TempDevicePath); \r
+        FreePool (TempDevicePath); \r
       }\r
       return FALSE;\r
     }\r
@@ -1885,8 +1891,10 @@ BdsLibUpdateFvFileDevicePath (
       FoundFvHandle = FvHandleBuffer[Index];\r
       break;\r
     }\r
-    \r
-    SafeFreePool (FvHandleBuffer);  \r
+\r
+    if (FvHandleBuffer != NULL) {\r
+      FreePool (FvHandleBuffer);  \r
+    }\r
   }\r
 \r
   if (FindFvFile) {\r

diff --git a/MdeModulePkg/Library/GenericBdsLib/BdsConnect.c b/MdeModulePkg/Library/GenericBdsLib/BdsConnect.c
index 5e7d13fb826ed2b0f530648ae9bb9c36b5a593fe..66b09ee46522c1d413b55f44132ef4e6e686260e 100644 (file)
--- a/MdeModulePkg/Library/GenericBdsLib/BdsConnect.c
+++ b/MdeModulePkg/Library/GenericBdsLib/BdsConnect.c
@@ -176,7 +176,7 @@ BdsLibConnectDevicePath (
   } while (DevicePath != NULL);\r
 \r
   if (CopyOfDevicePath != NULL) {\r
-    SafeFreePool (CopyOfDevicePath);\r
+    FreePool (CopyOfDevicePath);\r
   }\r
   //\r
   // All handle with DevicePath exists in the handle database\r
@@ -220,7 +220,9 @@ BdsLibConnectAllEfi (
     Status = gBS->ConnectController (HandleBuffer[Index], NULL, NULL, TRUE);\r
   }\r
 \r
-  SafeFreePool (HandleBuffer);\r
+  if (HandleBuffer != NULL) {\r
+    FreePool (HandleBuffer);\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -263,7 +265,9 @@ BdsLibDisconnectAllEfi (
     Status = gBS->DisconnectController (HandleBuffer[Index], NULL, NULL);\r
   }\r
 \r
-  SafeFreePool (HandleBuffer);\r
+  if (HandleBuffer != NULL) {\r
+    FreePool (HandleBuffer);\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Library/GenericBdsLib/BdsConsole.c b/MdeModulePkg/Library/GenericBdsLib/BdsConsole.c
index dacc9c22d19eca8d47d6ba5e50c1d001acf1e511..376a3187be3f03dde6315b2ae1cd38f543f3618e 100644 (file)
--- a/MdeModulePkg/Library/GenericBdsLib/BdsConsole.c
+++ b/MdeModulePkg/Library/GenericBdsLib/BdsConsole.c
@@ -126,7 +126,9 @@ BdsLibUpdateConsoleVariable (
       //\r
       TempNewDevicePath = NewDevicePath;\r
       NewDevicePath = AppendDevicePathInstance (NewDevicePath, CustomizedConDevicePath);\r
-      SafeFreePool(TempNewDevicePath);\r
+      if (TempNewDevicePath != NULL) {\r
+        FreePool(TempNewDevicePath);\r
+      }\r
     }\r
   }\r
 \r
@@ -157,10 +159,16 @@ BdsLibUpdateConsoleVariable (
         );\r
 \r
   if (VarConsole == NewDevicePath) {\r
-    SafeFreePool(VarConsole);\r
+    if (VarConsole != NULL) {\r
+      FreePool(VarConsole);\r
+    }\r
   } else {\r
-    SafeFreePool(VarConsole);\r
-    SafeFreePool(NewDevicePath);\r
+    if (VarConsole != NULL) {\r
+      FreePool(VarConsole);\r
+    }\r
+    if (NewDevicePath) {\r
+      FreePool(NewDevicePath);\r
+    }\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -258,10 +266,10 @@ BdsLibConnectConsoleVariable (
         DeviceExist = TRUE;\r
       }\r
     }\r
-    SafeFreePool(Instance);\r
+    FreePool(Instance);\r
   } while (CopyOfDevicePath != NULL);\r
 \r
-  SafeFreePool (StartDevicePath);\r
+  FreePool (StartDevicePath);\r
 \r
   if (!DeviceExist) {\r
     return EFI_NOT_FOUND;\r
@@ -312,7 +320,10 @@ BdsLibConnectAllConsoles (
     BdsLibUpdateConsoleVariable (L"ConIn", ConDevicePath, NULL);\r
   }\r
 \r
-  SafeFreePool(HandleBuffer);\r
+  if (HandleBuffer != NULL) {\r
+    FreePool(HandleBuffer);\r
+    HandleBuffer = NULL;\r
+  }\r
 \r
   gBS->LocateHandleBuffer (\r
           ByProtocol,\r
@@ -331,7 +342,9 @@ BdsLibConnectAllConsoles (
     BdsLibUpdateConsoleVariable (L"ErrOut", ConDevicePath, NULL);\r
   }\r
 \r
-  SafeFreePool(HandleBuffer);\r
+  if (HandleBuffer != NULL) {\r
+    FreePool(HandleBuffer);\r
+  }\r
 \r
   //\r
   // Connect all console variables\r

diff --git a/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c b/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c
index 499d0f30b3a9fa9e464c3b5a8a9d41cc1ad7a7fd..994f90ed0d81c6e81a8c6d10211b6e902fb0a5ca 100644 (file)
--- a/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -304,25 +304,27 @@ BdsLibRegisterNewOption (
         //\r
         // Got the option, so just return\r
         //\r
-        SafeFreePool (OptionPtr);\r
-        SafeFreePool (TempOptionPtr);\r
+        FreePool (OptionPtr);\r
+        FreePool (TempOptionPtr);\r
         return EFI_SUCCESS;\r
       } else {\r
         //\r
         // Option description changed, need update.\r
         //\r
         UpdateDescription = TRUE;\r
-        SafeFreePool (OptionPtr);\r
+        FreePool (OptionPtr);\r
         break;\r
       }\r
     }\r
 \r
-    SafeFreePool (OptionPtr);\r
+    FreePool (OptionPtr);\r
   }\r
 \r
   OptionSize          = sizeof (UINT32) + sizeof (UINT16) + StrSize (String);\r
   OptionSize          += GetDevicePathSize (DevicePath);\r
   OptionPtr           = AllocateZeroPool (OptionSize);\r
+  ASSERT (OptionPtr != NULL);\r
+  \r
   TempPtr             = OptionPtr;\r
   *(UINT32 *) TempPtr = LOAD_OPTION_ACTIVE;\r
   TempPtr             += sizeof (UINT32);\r
@@ -361,12 +363,12 @@ BdsLibRegisterNewOption (
   // Return if only need to update a changed description or fail to set option.\r
   //\r
   if (EFI_ERROR (Status) || UpdateDescription) {\r
-    SafeFreePool (OptionPtr);\r
-    SafeFreePool (TempOptionPtr);\r
+    FreePool (OptionPtr);\r
+    FreePool (TempOptionPtr);\r
     return Status;\r
   }\r
 \r
-  SafeFreePool (OptionPtr);\r
+  FreePool (OptionPtr);\r
 \r
   //\r
   // Update the option order variable\r
@@ -384,7 +386,7 @@ BdsLibRegisterNewOption (
                     sizeof (UINT16),\r
                     &BootOrderEntry\r
                     );\r
-    SafeFreePool (TempOptionPtr);\r
+    FreePool (TempOptionPtr);\r
     return Status;\r
   }\r
 \r
@@ -393,6 +395,8 @@ BdsLibRegisterNewOption (
   //\r
   OrderItemNum = (TempOptionSize / sizeof (UINT16)) + 1 ;\r
   OptionOrderPtr = AllocateZeroPool ( OrderItemNum * sizeof (UINT16));\r
+  ASSERT (OptionOrderPtr!= NULL);\r
+  \r
   CopyMem (OptionOrderPtr, TempOptionPtr, (OrderItemNum - 1) * sizeof (UINT16));\r
 \r
   OptionOrderPtr[Index] = RegisterOptionNumber;\r
@@ -404,8 +408,8 @@ BdsLibRegisterNewOption (
                   OrderItemNum * sizeof (UINT16),\r
                   OptionOrderPtr\r
                   );\r
-  SafeFreePool (TempOptionPtr);\r
-  SafeFreePool (OptionOrderPtr);\r
+  FreePool (TempOptionPtr);\r
+  FreePool (OptionOrderPtr);\r
 \r
   return Status;\r
 }\r
@@ -525,12 +529,12 @@ BdsLibVariableToOption (
   //\r
   if ((Option->Attribute & LOAD_OPTION_ACTIVE) == LOAD_OPTION_ACTIVE) {\r
     InsertTailList (BdsCommonOptionList, &Option->Link);\r
-    SafeFreePool (Variable);\r
+    FreePool (Variable);\r
     return Option;\r
   }\r
 \r
-  SafeFreePool (Variable);\r
-  SafeFreePool (Option);\r
+  FreePool (Variable);\r
+  FreePool (Option);\r
   return NULL;\r
 \r
 }\r
@@ -591,7 +595,7 @@ BdsLibBuildOptionFromVar (
 \r
   }\r
 \r
-  SafeFreePool (OptionOrder);\r
+  FreePool (OptionOrder);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -716,9 +720,11 @@ BdsLibDelPartMatchInstance (
       //\r
       TempNewDevicePath = NewDevicePath;\r
       NewDevicePath = AppendDevicePathInstance (NewDevicePath, Instance);\r
-      SafeFreePool(TempNewDevicePath);\r
+      if (TempNewDevicePath != NULL) {\r
+        FreePool(TempNewDevicePath);\r
+      }\r
     }\r
-    SafeFreePool(Instance);\r
+    FreePool(Instance);\r
     Instance = GetNextDevicePathInstance (&Multi, &InstanceSize);\r
     InstanceSize  -= END_DEVICE_PATH_LENGTH;\r
   }\r
@@ -766,11 +772,11 @@ BdsLibMatchDevicePaths (
     // return success\r
     //\r
     if (CompareMem (Single, DevicePathInst, Size) == 0) {\r
-      SafeFreePool (DevicePathInst);\r
+      FreePool (DevicePathInst);\r
       return TRUE;\r
     }\r
 \r
-    SafeFreePool (DevicePathInst);\r
+    FreePool (DevicePathInst);\r
     DevicePathInst = GetNextDevicePathInstance (&DevicePath, &Size);\r
   }\r
 \r
@@ -952,8 +958,8 @@ SetupResetReminder (
         IfrLibCreatePopUp (2, &Key, StringBuffer1, StringBuffer2);\r
       } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-      SafeFreePool (StringBuffer1);\r
-      SafeFreePool (StringBuffer2);\r
+      FreePool (StringBuffer1);\r
+      FreePool (StringBuffer2);\r
       //\r
       // If the user hits the YES Response key, reset\r
       //\r
@@ -1014,7 +1020,7 @@ BdsLibGetImageHeader (
                      &Root\r
                      );\r
   if (EFI_ERROR (Status)) {\r
-    Root = NULL;
+    Root = NULL;\r
     goto Done;\r
   }\r
 \r
@@ -1043,13 +1049,14 @@ BdsLibGetImageHeader (
       break;\r
     }\r
     if (Status != EFI_BUFFER_TOO_SMALL) {\r
+      FreePool (Info);\r
       goto Done;\r
     }\r
-    SafeFreePool (Info);\r
+    FreePool (Info);\r
   } while (TRUE);\r
 \r
   FileSize = Info->FileSize;\r
-  SafeFreePool (Info);\r
+  FreePool (Info);\r
 \r
   //\r
   // Read dos header\r

diff --git a/MdeModulePkg/Library/GenericBdsLib/DevicePath.c b/MdeModulePkg/Library/GenericBdsLib/DevicePath.c
index 793badb313cf57bff0433344662948cfc0117e77..affb009d4b5a553b5cb65b10b3d1f2568095e9e4 100644 (file)
--- a/MdeModulePkg/Library/GenericBdsLib/DevicePath.c
+++ b/MdeModulePkg/Library/GenericBdsLib/DevicePath.c
@@ -45,7 +45,7 @@ ReallocatePool (
       CopyMem (NewPool, OldPool, OldSize < NewSize ? OldSize : NewSize);\r
     }\r
 \r
-    SafeFreePool (OldPool);\r
+    FreePool (OldPool);\r
   }\r
 \r
   return NewPool;\r
@@ -108,7 +108,7 @@ CatPrint (
     Str->len = StringSize - sizeof (UINT16);\r
   }\r
 \r
-  SafeFreePool (AppendStr);\r
+  FreePool (AppendStr);\r
   return Str->str;\r
 }\r
 \r
@@ -1594,7 +1594,7 @@ DevicePathToStr (
   //\r
   // Shrink pool used for string allocation\r
   //\r
-  SafeFreePool (DevPath);\r
+  FreePool (DevPath);\r
 \r
 Done:\r
   NewSize = (Str.len + 1) * sizeof (CHAR16);\r

diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index 75aa91dc6c2f1a5e29a55f68428da166816ea409..bbf07fedddd113c80160a40e3ca8ee5f94e5e432 100644 (file)
--- a/MdeModulePkg/Library/GraphicsLib/Graphics.c
+++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c
@@ -467,7 +467,9 @@ EnableQuietBootEx (
       // Currently only support BMP format.\r
       //\r
       if (Format != EfiBadgingFormatBMP) {\r
-        SafeFreePool (ImageData);\r
+        if (ImageData != NULL) {\r
+          FreePool (ImageData);\r
+        }\r
         continue;\r
       }\r
     } else {\r
@@ -494,7 +496,9 @@ EnableQuietBootEx (
               &Width\r
               );\r
     if (EFI_ERROR (Status)) {\r
-      SafeFreePool (ImageData);\r
+      if (ImageData != NULL) {\r
+        FreePool (ImageData);\r
+      }\r
       if (Badging == NULL) {\r
         return Status;\r
       } else {\r
@@ -589,8 +593,12 @@ EnableQuietBootEx (
       }\r
     }\r
 \r
-    SafeFreePool (ImageData);\r
-    SafeFreePool (Blt);\r
+    if (ImageData != NULL) {\r
+      FreePool (ImageData);\r
+    }\r
+    if (Blt != NULL) {\r
+      FreePool (Blt);\r
+    }\r
 \r
     if (Badging == NULL) {\r
       break;\r
@@ -780,8 +788,8 @@ Print (
 \r
     Blt->Image.Bitmap = AllocateZeroPool (Blt->Width * Blt->Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
     if (Blt->Image.Bitmap == NULL) {\r
-      SafeFreePool (Blt);\r
-      SafeFreePool (Buffer);\r
+      FreePool (Blt);\r
+      FreePool (Buffer);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -824,15 +832,23 @@ Print (
                           );\r
     }\r
 \r
-    SafeFreePool (RowInfoArray);\r
-    SafeFreePool (Blt->Image.Bitmap);\r
+    if (RowInfoArray != NULL) {\r
+      FreePool (RowInfoArray);\r
+    }\r
+    if (Blt->Image.Bitmap != NULL) {\r
+      FreePool (Blt->Image.Bitmap);\r
+    }\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
   }\r
 \r
 Error:\r
-  SafeFreePool (Blt);\r
-  SafeFreePool (FontInfo);\r
+  if (Blt != NULL) {\r
+    FreePool (Blt);\r
+  }\r
+  if (FontInfo != NULL) { \r
+    FreePool (FontInfo);\r
+  }\r
   FreePool (Buffer);\r
 \r
   if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index e11e279247315b0f3b90734a0c67b6b3d5ecea2d..96000749c9efcff581f5eba66c8c6869d53bbd94 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
@@ -324,7 +324,8 @@ BdsCreateLegacyBootOption (
                   Buffer\r
                   );\r
 \r
-  SafeFreePool (Buffer);\r
+  FreePool (Buffer);\r
+  \r
   Buffer = NULL;\r
 \r
   NewBootOrderList = AllocateZeroPool (*BootOrderListSize + sizeof (UINT16));\r
@@ -334,12 +335,11 @@ BdsCreateLegacyBootOption (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  if (NULL != *BootOrderList) {\r
+  if (*BootOrderList != NULL) {\r
     CopyMem (NewBootOrderList, *BootOrderList, *BootOrderListSize);\r
+    FreePool (*BootOrderList);\r
   }\r
 \r
-  SafeFreePool (*BootOrderList);\r
-\r
   BootOrderLastIndex                    = (UINTN) (*BootOrderListSize / sizeof (UINT16));\r
   NewBootOrderList[BootOrderLastIndex]  = CurrentBootOptionNo;\r
   *BootOrderListSize += sizeof (UINT16);\r
@@ -462,7 +462,9 @@ BdsDeleteAllInvalidLegacyBootOptions (
                       &BootOptionSize\r
                       );\r
     if (NULL == BootOptionVar) {\r
-      SafeFreePool (BootOrder);\r
+      if (BootOrder != NULL) {\r
+        FreePool (BootOrder);\r
+      }\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
   \r
@@ -470,7 +472,9 @@ BdsDeleteAllInvalidLegacyBootOptions (
     // Skip Non-Legacy boot options\r
     // \r
     if (!BdsIsLegacyBootOption (BootOptionVar, &BbsEntry, &BbsIndex)) {\r
-      SafeFreePool (BootOptionVar);\r
+      if (BootOptionVar!= NULL) {\r
+        FreePool (BootOptionVar);\r
+      }\r
       Index++;\r
       continue;\r
     }\r
@@ -499,7 +503,9 @@ BdsDeleteAllInvalidLegacyBootOptions (
       continue;\r
     }\r
 \r
-    SafeFreePool (BootOptionVar);\r
+    if (BootOptionVar != NULL) {\r
+      FreePool (BootOptionVar);\r
+    }\r
     //\r
     // should delete\r
     //\r
@@ -525,7 +531,9 @@ BdsDeleteAllInvalidLegacyBootOptions (
     EfiLibDeleteVariable (L"BootOrder", &gEfiGlobalVariableGuid);\r
   }\r
 \r
-  SafeFreePool (BootOrder);\r
+  if (BootOrder != NULL) {\r
+    FreePool (BootOrder);\r
+  }\r
 \r
   return Status;\r
 }\r
@@ -588,19 +596,19 @@ BdsFindLegacyBootOptionByDevType (
     // Skip Non-legacy boot option\r
     //\r
     if (!BdsIsLegacyBootOption (BootOptionVar, &BbsEntry, BbsIndex)) {\r
-      SafeFreePool (BootOptionVar);\r
+      FreePool (BootOptionVar);\r
       continue;\r
     }\r
 \r
     if (BbsEntry->DeviceType != DevType) {\r
-      SafeFreePool (BootOptionVar);\r
+      FreePool (BootOptionVar);\r
       continue;\r
     }\r
 \r
     *Attribute    = *(UINT32 *) BootOptionVar;\r
     *OptionNumber = Index;\r
     Found         = TRUE;\r
-    SafeFreePool (BootOptionVar);\r
+    FreePool (BootOptionVar);\r
     break;\r
   }\r
 \r
@@ -767,7 +775,7 @@ BdsAddNonExistingLegacyBootOptions (
   }\r
 \r
   if (BootOrder != NULL) {\r
-    SafeFreePool (BootOrder);\r
+    FreePool (BootOrder);\r
   }\r
 \r
   return Status;\r
@@ -952,7 +960,7 @@ BdsCreateDevOrder (
                   TotalSize,\r
                   DevOrder\r
                   );\r
-  SafeFreePool (DevOrder);\r
+  FreePool (DevOrder);\r
 \r
   return Status;\r
 }\r
@@ -1382,7 +1390,7 @@ BdsUpdateLegacyDevOrder (
     }\r
   }\r
 \r
-  SafeFreePool (DevOrder);\r
+  FreePool (DevOrder);\r
 \r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
@@ -1391,7 +1399,7 @@ BdsUpdateLegacyDevOrder (
                   TotalSize,\r
                   NewDevOrder\r
                   );\r
-  SafeFreePool (NewDevOrder);\r
+  FreePool (NewDevOrder);\r
 \r
   return Status;\r
 }\r
@@ -1442,7 +1450,7 @@ BdsSetBootPriority4SameTypeDev (
   }\r
 \r
   if (DevOrder >= OrigBuffer + DevOrderSize) {\r
-    SafeFreePool (OrigBuffer);\r
+    FreePool (OrigBuffer);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -1463,7 +1471,7 @@ BdsSetBootPriority4SameTypeDev (
     }\r
   }\r
 \r
-  SafeFreePool (OrigBuffer);\r
+  FreePool (OrigBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1619,7 +1627,7 @@ BdsRefreshBbsTableForBoot (
     Ptr += StrSize ((UINT16 *) Ptr);\r
     DevPath = (EFI_DEVICE_PATH_PROTOCOL *) Ptr;\r
     if (BBS_DEVICE_PATH != DevPath->Type || BBS_BBS_DP != DevPath->SubType) {\r
-      SafeFreePool (BootOptionVar);\r
+      FreePool (BootOptionVar);\r
       continue;\r
     }\r
 \r
@@ -1628,7 +1636,7 @@ BdsRefreshBbsTableForBoot (
       //\r
       // We don't want to process twice for a device type\r
       //\r
-      SafeFreePool (BootOptionVar);\r
+      FreePool (BootOptionVar);\r
       continue;\r
     }\r
 \r
@@ -1637,14 +1645,14 @@ BdsRefreshBbsTableForBoot (
               LocalBbsTable,\r
               &Priority\r
               );\r
-    SafeFreePool (BootOptionVar);\r
+    FreePool (BootOptionVar);\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
   }\r
 \r
   if (BootOrder != NULL) {\r
-    SafeFreePool (BootOrder);\r
+    FreePool (BootOrder);\r
   }\r
   //\r
   // For debug\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
index 2e4b1c6fb271e5d1e5ed6c2f464221c0fe9e7867..9ef2f7f034c1a07f209993a28dd1a95078ec05ee 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
@@ -125,7 +125,9 @@ EfiGrowBuffer (
   TryAgain = FALSE;\r
   if (*Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-    SafeFreePool (*Buffer);\r
+    if (*Buffer != NULL) {\r
+      FreePool (*Buffer);\r
+    }\r
 \r
     *Buffer = AllocateZeroPool (BufferSize);\r
 \r
@@ -139,7 +141,7 @@ EfiGrowBuffer (
   // If there's an error, free the buffer\r
   //\r
   if (!TryAgain && EFI_ERROR (*Status) && (*Buffer != NULL)) {\r
-    SafeFreePool (*Buffer);\r
+    FreePool (*Buffer);\r
     *Buffer = NULL;\r
   }\r
 \r
@@ -201,7 +203,7 @@ EfiLibDeleteVariable (
     //\r
     Status = gRT->SetVariable (VarName, VarGuid, VAR_FLAG, 0, NULL);\r
     ASSERT (!EFI_ERROR (Status));\r
-    SafeFreePool (VarBuf);\r
+    FreePool (VarBuf);\r
   }\r
 \r
   return Status;\r
@@ -373,7 +375,7 @@ EfiReallocatePool (
       CopyMem (NewPool, OldPool, OldSize < NewSize ? OldSize : NewSize);\r
     }\r
 \r
-    SafeFreePool (OldPool);\r
+    FreePool (OldPool);\r
   }\r
 \r
   return NewPool;\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index fffcd681408c2d27d09bf0185c1fb256706f8aa9..ac313989874c0ee5020984eba0bebcdfe43b1d52 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -811,7 +811,7 @@ InitializeBM (
   //\r
   Ptr = AllocateZeroPool (sizeof (BM_LOAD_CONTEXT) + sizeof (BM_FILE_CONTEXT) + sizeof (BM_HANDLE_CONTEXT) + sizeof (BM_MENU_ENTRY));\r
   if (Ptr == NULL) {\r
-    SafeFreePool (BmmCallbackInfo);\r
+    FreePool (BmmCallbackInfo);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -917,8 +917,8 @@ InitializeBM (
   gUpdateData.BufferSize = UPDATE_DATA_SIZE;\r
   gUpdateData.Data = AllocateZeroPool (UPDATE_DATA_SIZE);\r
   if (gUpdateData.Data == NULL) {\r
-    SafeFreePool (BmmCallbackInfo->LoadContext);\r
-    SafeFreePool (BmmCallbackInfo);\r
+    FreePool (BmmCallbackInfo->LoadContext);\r
+    FreePool (BmmCallbackInfo);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -1020,9 +1020,9 @@ InitializeBM (
 \r
   FreeAllMenu ();\r
 \r
-  SafeFreePool (BmmCallbackInfo->LoadContext);\r
-  SafeFreePool (BmmCallbackInfo);\r
-  SafeFreePool (gUpdateData.Data);\r
+  FreePool (BmmCallbackInfo->LoadContext);\r
+  FreePool (BmmCallbackInfo);\r
+  FreePool (gUpdateData.Data);\r
   gUpdateData.Data = NULL;\r
 \r
   return Status;\r
@@ -1205,7 +1205,7 @@ CleanUpStringDepository (
     CurrentListNode = StringDepository->ListHead;\r
     for (NodeIndex = 0; NodeIndex < StringDepository->TotalNodeNumber; NodeIndex++) {\r
       NextListNode = CurrentListNode->Next;\r
-      SafeFreePool (CurrentListNode);\r
+      FreePool (CurrentListNode);\r
       CurrentListNode = NextListNode;\r
     }\r
 \r
@@ -1214,7 +1214,7 @@ CleanUpStringDepository (
   //\r
   // Release string depository.\r
   //\r
-  SafeFreePool (FileOptionStrDepository);\r
+  FreePool (FileOptionStrDepository);\r
 }\r
 \r
 /**\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 020d63a8c615a5e9791c5514f615c2a78f99ff68..85ba61707faa4afa5cec427deeb1b196f6065098 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -83,7 +83,7 @@ BOpt_CreateMenuEntry (
 \r
   MenuEntry->VariableContext = AllocateZeroPool (ContextSize);\r
   if (NULL == MenuEntry->VariableContext) {\r
-    SafeFreePool (MenuEntry);\r
+    FreePool (MenuEntry);\r
     return NULL;\r
   }\r
 \r
@@ -116,59 +116,65 @@ BOpt_DestroyMenuEntry (
   switch (MenuEntry->ContextSelection) {\r
   case BM_LOAD_CONTEXT_SELECT:\r
     LoadContext = (BM_LOAD_CONTEXT *) MenuEntry->VariableContext;\r
-    SafeFreePool (LoadContext->FilePathList);\r
-    SafeFreePool (LoadContext->LoadOption);\r
-    SafeFreePool (LoadContext->OptionalData);\r
-    SafeFreePool (LoadContext);\r
+    FreePool (LoadContext->FilePathList);\r
+    FreePool (LoadContext->LoadOption);\r
+    if (LoadContext->OptionalData != NULL) {\r
+      FreePool (LoadContext->OptionalData);\r
+    }\r
+    FreePool (LoadContext);\r
     break;\r
 \r
   case BM_FILE_CONTEXT_SELECT:\r
     FileContext = (BM_FILE_CONTEXT *) MenuEntry->VariableContext;\r
 \r
     if (!FileContext->IsRoot) {\r
-      SafeFreePool (FileContext->DevicePath);\r
+      FreePool (FileContext->DevicePath);\r
     } else {\r
       if (FileContext->FHandle != NULL) {\r
         FileContext->FHandle->Close (FileContext->FHandle);\r
       }\r
     }\r
 \r
-    SafeFreePool (FileContext->FileName);\r
-    SafeFreePool (FileContext->Info);\r
-    SafeFreePool (FileContext);\r
+    if (FileContext->FileName != NULL) {\r
+      FreePool (FileContext->FileName);\r
+    }\r
+    if (FileContext->Info != NULL) {\r
+      FreePool (FileContext->Info);\r
+    }\r
+    FreePool (FileContext);\r
     break;\r
 \r
   case BM_CONSOLE_CONTEXT_SELECT:\r
     ConsoleContext = (BM_CONSOLE_CONTEXT *) MenuEntry->VariableContext;\r
-    SafeFreePool (ConsoleContext->DevicePath);\r
-    SafeFreePool (ConsoleContext);\r
+    FreePool (ConsoleContext->DevicePath);\r
+    FreePool (ConsoleContext);\r
     break;\r
 \r
   case BM_TERMINAL_CONTEXT_SELECT:\r
     TerminalContext = (BM_TERMINAL_CONTEXT *) MenuEntry->VariableContext;\r
-    SafeFreePool (TerminalContext->DevicePath);\r
-    SafeFreePool (TerminalContext);\r
+    FreePool (TerminalContext->DevicePath);\r
+    FreePool (TerminalContext);\r
     break;\r
 \r
   case BM_HANDLE_CONTEXT_SELECT:\r
     HandleContext = (BM_HANDLE_CONTEXT *) MenuEntry->VariableContext;\r
-    SafeFreePool (HandleContext);\r
+    FreePool (HandleContext);\r
     break;\r
 \r
   case BM_LEGACY_DEV_CONTEXT_SELECT:\r
     LegacyDevContext = (BM_LEGACY_DEVICE_CONTEXT *) MenuEntry->VariableContext;\r
-    SafeFreePool (LegacyDevContext);\r
+    FreePool (LegacyDevContext);\r
 \r
   default:\r
     break;\r
   }\r
 \r
-  SafeFreePool (MenuEntry->DisplayString);\r
+  FreePool (MenuEntry->DisplayString);\r
   if (NULL != MenuEntry->HelpString) {\r
-    SafeFreePool (MenuEntry->HelpString);\r
+    FreePool (MenuEntry->HelpString);\r
   }\r
 \r
-  SafeFreePool (MenuEntry);\r
+  FreePool (MenuEntry);\r
 }\r
 \r
 /**\r
@@ -278,7 +284,7 @@ BOpt_FindFileSystem (
       if (BlkIo->Media->RemovableMedia) {\r
         Buffer = AllocateZeroPool (BlkIo->Media->BlockSize);\r
         if (NULL == Buffer) {\r
-          SafeFreePool (BlkIoHandle);\r
+          FreePool (BlkIoHandle);\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
@@ -289,10 +295,10 @@ BOpt_FindFileSystem (
                 BlkIo->Media->BlockSize,\r
                 Buffer\r
                 );\r
-        SafeFreePool (Buffer);\r
+        FreePool (Buffer);\r
       }\r
     }\r
-    SafeFreePool (BlkIoHandle);\r
+    FreePool (BlkIoHandle);\r
   }\r
 \r
   //\r
@@ -332,7 +338,7 @@ BOpt_FindFileSystem (
       //\r
       MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT);\r
       if (NULL == MenuEntry) {\r
-        SafeFreePool (SimpleFsHandle);\r
+        FreePool (SimpleFsHandle);\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
@@ -390,7 +396,7 @@ BOpt_FindFileSystem (
   }\r
 \r
   if (NoSimpleFsHandles != 0) {\r
-    SafeFreePool (SimpleFsHandle);\r
+    FreePool (SimpleFsHandle);\r
   }\r
   //\r
   // Searching for handles that support Load File protocol\r
@@ -407,7 +413,7 @@ BOpt_FindFileSystem (
     for (Index = 0; Index < NoLoadFileHandles; Index++) {\r
       MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT);\r
       if (NULL == MenuEntry) {\r
-        SafeFreePool (LoadFileHandle);\r
+        FreePool (LoadFileHandle);\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
@@ -438,7 +444,7 @@ BOpt_FindFileSystem (
   }\r
 \r
   if (NoLoadFileHandles != 0) {\r
-    SafeFreePool (LoadFileHandle);\r
+    FreePool (LoadFileHandle);\r
   }\r
 \r
   //\r
@@ -676,7 +682,7 @@ BOpt_FindFiles (
   }\r
 \r
   DirectoryMenu.MenuNumber = OptionNumber;\r
-  SafeFreePool (DirInfo);\r
+  FreePool (DirInfo);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -898,7 +904,7 @@ BOpt_GetBootOptions (
 \r
   if (BootNext != NULL) {\r
     if (BootNextSize != sizeof (UINT16)) {\r
-      SafeFreePool (BootNext);\r
+      FreePool (BootNext);\r
       BootNext = NULL;\r
     }\r
   }\r
@@ -923,7 +929,7 @@ BOpt_GetBootOptions (
     }\r
 \r
     CopyMem (LoadOption, LoadOptionFromVar, BootOptionSize);\r
-    SafeFreePool (LoadOptionFromVar);\r
+    FreePool (LoadOptionFromVar);\r
 \r
     if (BootNext != NULL) {\r
       BootNextFlag = (BOOLEAN) (*BootNext == BootOrderList[Index]);\r
@@ -932,7 +938,7 @@ BOpt_GetBootOptions (
     }\r
 \r
     if (0 == (*((UINT32 *) LoadOption) & LOAD_OPTION_ACTIVE)) {\r
-      SafeFreePool (LoadOption);\r
+      FreePool (LoadOption);\r
       continue;\r
     }\r
     //\r
@@ -1054,8 +1060,12 @@ BOpt_GetBootOptions (
     MenuCount++;\r
   }\r
 \r
-  SafeFreePool (BootNext);\r
-  SafeFreePool (BootOrderList);\r
+  if (BootNext != NULL) {\r
+    FreePool (BootNext);\r
+  }\r
+  if (BootOrderList != NULL) {\r
+    FreePool (BootOrderList);\r
+  }\r
   BootOptionMenu.MenuNumber = MenuCount;\r
   return MenuCount;\r
 }\r
@@ -1318,7 +1328,7 @@ BOpt_FindDrivers (
 \r
     NewMenuEntry = BOpt_CreateMenuEntry (BM_HANDLE_CONTEXT_SELECT);\r
     if (NULL == NewMenuEntry) {\r
-      SafeFreePool (DevicePathHandle);\r
+      FreePool (DevicePathHandle);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -1332,7 +1342,10 @@ BOpt_FindDrivers (
     InsertTailList (&DriverMenu.Head, &NewMenuEntry->Link);\r
 \r
   }\r
-  SafeFreePool (DevicePathHandle);\r
+\r
+  if (DevicePathHandle != NULL) {\r
+    FreePool (DevicePathHandle);\r
+  }\r
 \r
   DriverMenu.MenuNumber = OptionNumber;\r
   return EFI_SUCCESS;\r
@@ -1545,7 +1558,7 @@ BOpt_GetDriverOptions (
     }\r
 \r
     CopyMem (LoadOption, LoadOptionFromVar, DriverOptionSize);\r
-    SafeFreePool (LoadOptionFromVar);\r
+    FreePool (LoadOptionFromVar);\r
 \r
     NewMenuEntry = BOpt_CreateMenuEntry (BM_LOAD_CONTEXT_SELECT);\r
     if (NULL == NewMenuEntry) {\r
@@ -1631,7 +1644,9 @@ BOpt_GetDriverOptions (
 \r
   }\r
 \r
-  SafeFreePool (DriverOrderList);\r
+  if (DriverOrderList != NULL) {\r
+    FreePool (DriverOrderList);\r
+  }\r
   DriverOptionMenu.MenuNumber = Index;\r
   return EFI_SUCCESS;\r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
index 635dc34173c04033108293865ce0971c98478bbc..b9ffa056dacf372ab4aa06ff7811809e8588214a 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
@@ -419,7 +419,7 @@ LocateSerialIo (
     if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
       NewMenuEntry = BOpt_CreateMenuEntry (BM_TERMINAL_CONTEXT_SELECT);\r
       if (NewMenuEntry == NULL) {\r
-        SafeFreePool (Handles);\r
+        FreePool (Handles);\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
@@ -472,7 +472,9 @@ LocateSerialIo (
       TerminalMenu.MenuNumber++;\r
     }\r
   }\r
-  SafeFreePool (Handles);\r
+  if (Handles != NULL) {\r
+    FreePool (Handles);\r
+  }\r
 \r
   //\r
   // Get L"ConOut", L"ConIn" and L"ErrOut" from the Var\r
@@ -515,7 +517,9 @@ LocateSerialIo (
                         NewTerminalContext->DevicePath,\r
                         (EFI_DEVICE_PATH_PROTOCOL *) &Vendor\r
                         );\r
-      SafeFreePool (NewMenuEntry->HelpString);\r
+      if (NewMenuEntry->HelpString != NULL) {\r
+        FreePool (NewMenuEntry->HelpString);\r
+      }\r
       //\r
       // NewMenuEntry->HelpString = DevicePathToStr (NewDevicePath);\r
       // NewMenuEntry->DisplayString = NewMenuEntry->HelpString;\r
@@ -999,6 +1003,6 @@ GetConsoleOutMode (
         }\r
       }\r
     }\r
+    FreePool (ModeInfo);\r
   }\r
-  SafeFreePool (ModeInfo);\r
 }\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 3de4a0d6874965170630461a042a0ff105e18542..2ffb1ff037a7259751f37598e72dff5ade905175 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -549,7 +549,7 @@ UpdateOrderPage (
       );\r
   }\r
 \r
-  SafeFreePool (IfrOptionList);\r
+  FreePool (IfrOptionList);\r
 \r
   UpdatePageEnd (CallbackData);\r
 \r
@@ -626,7 +626,7 @@ UpdateBootNextPage (
       &gUpdateData\r
       );\r
 \r
-    SafeFreePool (IfrOptionList);\r
+    FreePool (IfrOptionList);\r
   }\r
 \r
   UpdatePageEnd (CallbackData);\r
@@ -771,8 +771,8 @@ UpdateConModePage (
     ValidMode,\r
     &gUpdateData\r
     );\r
-  SafeFreePool (IfrOptionList);\r
-  SafeFreePool (ModeToken);\r
+  FreePool (IfrOptionList);\r
+  FreePool (ModeToken);\r
 \r
   UpdatePageEnd (CallbackData);\r
 }\r
@@ -946,7 +946,7 @@ UpdateTerminalPage (
     &gUpdateData\r
     );\r
 \r
-  SafeFreePool (IfrOptionList);\r
+  FreePool (IfrOptionList);\r
 \r
   UpdatePageEnd (CallbackData);\r
 }\r
@@ -1063,14 +1063,14 @@ GetLegacyBootOptionVar (
         (BBS_BBS_DP == DevicePath->SubType)\r
         ) {\r
       *OptionIndex = OrderBuffer[Index];\r
-      SafeFreePool (OrderBuffer);\r
+      FreePool (OrderBuffer);\r
       return OptionBuffer;\r
     } else {\r
-      SafeFreePool (OptionBuffer);\r
+      FreePool (OptionBuffer);\r
     }\r
   }\r
 \r
-  SafeFreePool (OrderBuffer);\r
+  FreePool (OrderBuffer);\r
   return NULL;\r
 }\r
 \r
@@ -1271,7 +1271,7 @@ UpdateSetLegacyDeviceOrderPage (
   CopyMem (OldData, LegacyOrder, 100);\r
 \r
   if (IfrOptionList != NULL) {\r
-    SafeFreePool (IfrOptionList);\r
+    FreePool (IfrOptionList);\r
     IfrOptionList = NULL;\r
   }\r
 \r

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

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index c2540795cd403581031512cb97fca00e833d21a7..2743dd8d04c166409d9a42a021ec22962d35dde4 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
@@ -795,7 +795,9 @@ ConPlatformMatchDevicePaths (
                             TempDevicePath1,\r
                             DevicePathInst\r
                             );\r
-        SafeFreePool (TempDevicePath1);\r
+        if (TempDevicePath1 != NULL) {\r
+          FreePool (TempDevicePath1);\r
+        }\r
         TempDevicePath1 = TempDevicePath2;\r
       }\r
     }\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index a57265ebd22e92b01abf5296219bd26efc97cfbc..6a0aad5716eac3b4fe9c89a58aea7a4d5be132b3 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -393,8 +393,8 @@ GraphicsConsoleControllerDriverStart (
     PackageList = HiiLibPreparePackageList (1, &mFontPackageListGuid, Package);\r
     Status = mHiiDatabase->NewPackageList (mHiiDatabase, PackageList, NULL, &(Private->HiiHandle));\r
     ASSERT_EFI_ERROR (Status);\r
-    SafeFreePool (PackageList);\r
-    SafeFreePool (Package);\r
+    FreePool (PackageList);\r
+    FreePool (Package);\r
 \r
     mFirstAccessFlag = FALSE;\r
   }\r
@@ -1205,8 +1205,10 @@ GraphicsConsoleConOutTestString (
                          &Blt,\r
                          NULL\r
                          );\r
-    SafeFreePool (Blt);\r
-    Blt = NULL;\r
+    if (Blt != NULL) {\r
+      FreePool (Blt);\r
+      Blt = NULL;\r
+    }\r
     Count++;\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -1754,7 +1756,7 @@ DrawUnicodeWeightAtCursorN (
 \r
   String = AllocateCopyPool ((Count + 1) * sizeof (CHAR16), UnicodeWeight);\r
   if (String == NULL) {\r
-    SafeFreePool (Blt);\r
+    FreePool (Blt);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
@@ -1764,8 +1766,8 @@ DrawUnicodeWeightAtCursorN (
 \r
   FontInfo = (EFI_FONT_DISPLAY_INFO *) AllocateZeroPool (sizeof (EFI_FONT_DISPLAY_INFO));\r
   if (FontInfo == NULL) {\r
-    SafeFreePool (Blt);\r
-    SafeFreePool (String);\r
+    FreePool (Blt);\r
+    FreePool (String);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
@@ -1803,8 +1805,8 @@ DrawUnicodeWeightAtCursorN (
 \r
     Blt->Image.Bitmap = AllocateZeroPool (Blt->Width * Blt->Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
     if (Blt->Image.Bitmap == NULL) {\r
-      SafeFreePool (Blt);\r
-      SafeFreePool (String);\r
+      FreePool (Blt);\r
+      FreePool (String);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -1847,15 +1849,21 @@ DrawUnicodeWeightAtCursorN (
                           );\r
     }\r
 \r
-    SafeFreePool (RowInfoArray);\r
-    SafeFreePool (Blt->Image.Bitmap);\r
+    FreePool (RowInfoArray);\r
+    FreePool (Blt->Image.Bitmap);\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
   }\r
 \r
-  SafeFreePool (Blt);\r
-  SafeFreePool (String);\r
-  SafeFreePool (FontInfo);\r
+  if (Blt != NULL) {\r
+    FreePool (Blt);\r
+  }\r
+  if (String != NULL) {\r
+    FreePool (String);\r
+  }\r
+  if (FontInfo != NULL) {\r
+    FreePool (FontInfo);\r
+  }\r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index c36eb066e05843dfda62823474abbdbf10a904a7..390f95a36e42942898e7c880f0540510c72bba0a 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -70,5 +70,5 @@
 \r
 \r
 [Depex]\r
-  gEfiSimpleTextOutProtocolGuid AND gEfiHiiDatabaseProtocolGuid\r
+  gEfiSimpleTextOutProtocolGuid AND gEfiHiiDatabaseProtocolGuid AND gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid\r
 \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 59c2b15109cf1fe31e88d7ae7ac0faec1e0ba620..aed93be1f03f7e2c0db37f5e9025d5d9aee27c76 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -127,13 +127,13 @@ GetDevicePath (
   Length /= 2;\r
   *DevicePath = (UINT8 *) AllocateZeroPool (Length);\r
   if (*DevicePath == NULL) {\r
-    SafeFreePool (DevicePathString);\r
+    FreePool (DevicePathString);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   HexStringToBufInReverseOrder (*DevicePath, &Length, DevicePathString);\r
 \r
-  SafeFreePool (DevicePathString);\r
+  FreePool (DevicePathString);\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -202,7 +202,9 @@ ExportAllStorage (
                );\r
   }\r
   if (EFI_ERROR (Status)) {\r
-    SafeFreePool (HandleBuffer);\r
+    if (HandleBuffer != NULL) {\r
+      FreePool (HandleBuffer);\r
+    }\r
     return Status;\r
   }\r
 \r
@@ -219,8 +221,8 @@ ExportAllStorage (
       Status = HiiExportPackageLists (HiiDatabase, HiiHandle, &BufferSize, HiiPackageList);\r
     }\r
     if (EFI_ERROR (Status)) {\r
-      SafeFreePool (HandleBuffer);\r
-      SafeFreePool (HiiPackageList);\r
+      FreePool (HandleBuffer);\r
+      FreePool (HiiPackageList);\r
       return Status;\r
     }\r
 \r
@@ -270,9 +272,9 @@ ExportAllStorage (
 \r
         Status = HiiGetPackageListHandle (HiiDatabase, HiiHandle, &DriverHandle);\r
         if (EFI_ERROR (Status)) {\r
-          SafeFreePool (HandleBuffer);\r
-          SafeFreePool (HiiPackageList);\r
-          SafeFreePool (Storage);\r
+          FreePool (HandleBuffer);\r
+          FreePool (HiiPackageList);\r
+          FreePool (Storage);\r
           return Status;\r
         }\r
         Storage->DriverHandle = DriverHandle;\r
@@ -305,10 +307,10 @@ ExportAllStorage (
       }\r
     }\r
 \r
-    SafeFreePool (HiiPackageList);\r
+    FreePool (HiiPackageList);\r
   }\r
 \r
-  SafeFreePool (HandleBuffer);\r
+  FreePool (HandleBuffer);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -603,7 +605,9 @@ GetValueOfNumber (
   Status  = EFI_SUCCESS;\r
 \r
 Exit:\r
-  SafeFreePool (Str);\r
+  if (Str != NULL) {\r
+    FreePool (Str);\r
+  }\r
   return Status;\r
 }\r
 \r
@@ -738,7 +742,7 @@ HiiConfigRoutingExtractConfig (
     //\r
     Status = GetDevicePath (ConfigRequest, (UINT8 **) &DevicePath);\r
     if (EFI_ERROR (Status)) {\r
-      SafeFreePool (ConfigRequest);\r
+      FreePool (ConfigRequest);\r
       return Status;\r
     }\r
 \r
@@ -765,7 +769,7 @@ HiiConfigRoutingExtractConfig (
       }\r
     }\r
 \r
-    SafeFreePool (DevicePath);\r
+    FreePool (DevicePath);\r
 \r
     if (DriverHandle == NULL) {\r
       //\r
@@ -773,7 +777,7 @@ HiiConfigRoutingExtractConfig (
       // Set Progress to the 'G' in "GUID" of the routing header.\r
       //\r
       *Progress = StringPtr;\r
-      SafeFreePool (ConfigRequest);\r
+      FreePool (ConfigRequest);\r
       return EFI_NOT_FOUND;\r
     }\r
 \r
@@ -802,7 +806,7 @@ HiiConfigRoutingExtractConfig (
       for (TmpPtr = StringPtr; CompareMem (TmpPtr, AccessProgress, RemainSize) != 0; TmpPtr++);\r
       *Progress = TmpPtr;\r
 \r
-      SafeFreePool (ConfigRequest);\r
+      FreePool (ConfigRequest);\r
       return Status;\r
     }\r
 \r
@@ -812,9 +816,9 @@ HiiConfigRoutingExtractConfig (
     ASSERT (*AccessProgress == 0);\r
     Status = AppendToMultiString (Results, AccessResults);\r
     ASSERT_EFI_ERROR (Status);\r
-    SafeFreePool (AccessResults);\r
+    FreePool (AccessResults);\r
     AccessResults = NULL;\r
-    SafeFreePool (ConfigRequest);\r
+    FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
 \r
     //\r
@@ -951,7 +955,7 @@ HiiConfigRoutingExportConfig (
     \r
     ConfigRequest = (EFI_STRING) AllocateZeroPool (RequestSize);\r
     if (ConfigRequest == NULL) {\r
-      SafeFreePool (PathHdr);\r
+      FreePool (PathHdr);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -997,7 +1001,7 @@ HiiConfigRoutingExportConfig (
     StringPtr += StrLen (L"PATH=");\r
     StrCpy (StringPtr, PathHdr);\r
 \r
-    SafeFreePool (PathHdr);\r
+    FreePool (PathHdr);\r
     PathHdr = NULL;\r
 \r
     //\r
@@ -1021,6 +1025,8 @@ HiiConfigRoutingExportConfig (
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
+    AccessProgress = NULL;\r
+    AccessResults  = NULL;\r
     Status = ConfigAccess->ExtractConfig (\r
                              ConfigAccess,\r
                              ConfigRequest,\r
@@ -1028,8 +1034,13 @@ HiiConfigRoutingExportConfig (
                              &AccessResults\r
                              );\r
     if (EFI_ERROR (Status)) {\r
-      SafeFreePool (ConfigRequest);\r
-      SafeFreePool (AccessResults);\r
+      FreePool (ConfigRequest);\r
+      if (AccessProgress != NULL) {\r
+        FreePool (AccessProgress);\r
+      }\r
+      if (AccessResults != NULL) {\r
+        FreePool (AccessResults);\r
+      }\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -1039,9 +1050,9 @@ HiiConfigRoutingExportConfig (
     ASSERT (*AccessProgress == 0);\r
     Status = AppendToMultiString (Results, AccessResults);\r
     ASSERT_EFI_ERROR (Status);\r
-    SafeFreePool (AccessResults);\r
+    FreePool (AccessResults);\r
     AccessResults = NULL;\r
-    SafeFreePool (ConfigRequest);\r
+    FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
 \r
   }\r
@@ -1057,8 +1068,8 @@ HiiConfigRoutingExportConfig (
                 HII_FORMSET_STORAGE_SIGNATURE\r
                 );\r
     RemoveEntryList (&Storage->Entry);\r
-    SafeFreePool (Storage->Name);\r
-    SafeFreePool (Storage);\r
+    FreePool (Storage->Name);\r
+    FreePool (Storage);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -1173,7 +1184,7 @@ HiiConfigRoutingRouteConfig (
     //\r
     Status = GetDevicePath (ConfigResp, (UINT8 **) &DevicePath);\r
     if (EFI_ERROR (Status)) {\r
-      SafeFreePool (ConfigResp);\r
+      FreePool (ConfigResp);\r
       return Status;\r
     }\r
 \r
@@ -1200,7 +1211,7 @@ HiiConfigRoutingRouteConfig (
       }\r
     }\r
 \r
-    SafeFreePool (DevicePath);\r
+    FreePool (DevicePath);\r
 \r
     if (DriverHandle == NULL) {\r
       //\r
@@ -1208,7 +1219,7 @@ HiiConfigRoutingRouteConfig (
       // Set Progress to the 'G' in "GUID" of the routing header.\r
       //\r
       *Progress = StringPtr;\r
-      SafeFreePool (ConfigResp);\r
+      FreePool (ConfigResp);\r
       return EFI_NOT_FOUND;\r
     }\r
 \r
@@ -1237,11 +1248,11 @@ HiiConfigRoutingRouteConfig (
       for (TmpPtr = StringPtr; CompareMem (TmpPtr, AccessProgress, RemainSize) != 0; TmpPtr++);\r
       *Progress = TmpPtr;\r
 \r
-      SafeFreePool (ConfigResp);\r
+      FreePool (ConfigResp);\r
       return Status;\r
     }\r
 \r
-    SafeFreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
     ConfigResp = NULL;\r
 \r
     //\r
@@ -1408,7 +1419,7 @@ HiiBlockToConfig (
       TmpBuffer,\r
       (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)\r
       );\r
-    SafeFreePool (TmpBuffer);\r
+    FreePool (TmpBuffer);\r
 \r
     StringPtr += Length;\r
     if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {\r
@@ -1432,7 +1443,7 @@ HiiBlockToConfig (
       TmpBuffer,\r
       (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)\r
       );\r
-    SafeFreePool (TmpBuffer);\r
+    FreePool (TmpBuffer);\r
 \r
     StringPtr += Length;\r
     if (*StringPtr != 0 && *StringPtr != L'&') {\r
@@ -1471,7 +1482,7 @@ HiiBlockToConfig (
     ASSERT_EFI_ERROR (Status);\r
     ToLower (ValueStr);\r
 \r
-    SafeFreePool (Value);\r
+    FreePool (Value);\r
     Value = NULL;\r
 \r
     //\r
@@ -1493,8 +1504,8 @@ HiiBlockToConfig (
 \r
     AppendToMultiString (Config, ConfigElement);\r
 \r
-    SafeFreePool (ConfigElement);\r
-    SafeFreePool (ValueStr);\r
+    FreePool (ConfigElement);\r
+    FreePool (ValueStr);\r
     ConfigElement = NULL;\r
     ValueStr = NULL;\r
 \r
@@ -1519,11 +1530,16 @@ HiiBlockToConfig (
   return EFI_SUCCESS;\r
 \r
 Exit:\r
-\r
-  SafeFreePool (*Config);\r
-  SafeFreePool (ValueStr);\r
-  SafeFreePool (Value);\r
-  SafeFreePool (ConfigElement);\r
+  FreePool (*Config);\r
+  if (ValueStr != NULL) {\r
+    FreePool (ValueStr);\r
+  }\r
+  if (Value != NULL) {\r
+    FreePool (Value);\r
+  }\r
+  if (ConfigElement) {\r
+    FreePool (ConfigElement);\r
+  }\r
 \r
   return Status;\r
 \r
@@ -1658,7 +1674,7 @@ HiiConfigToBlock (
       TmpBuffer,\r
       (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)\r
       );\r
-    SafeFreePool (TmpBuffer);\r
+    FreePool (TmpBuffer);\r
 \r
     StringPtr += Length;\r
     if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {\r
@@ -1682,7 +1698,7 @@ HiiConfigToBlock (
       TmpBuffer,\r
       (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)\r
       );\r
-    SafeFreePool (TmpBuffer);\r
+    FreePool (TmpBuffer);\r
 \r
     StringPtr += Length;\r
     if (StrnCmp (StringPtr, L"&VALUE=", StrLen (L"&VALUE=")) != 0) {\r
@@ -1719,7 +1735,7 @@ HiiConfigToBlock (
     CopyMem (Block + Offset, Value, Width);\r
     *BlockSize = Offset + Width - 1;\r
 \r
-    SafeFreePool (Value);\r
+    FreePool (Value);\r
     Value = NULL;\r
 \r
     //\r
@@ -1743,7 +1759,9 @@ HiiConfigToBlock (
 \r
 Exit:\r
 \r
-  SafeFreePool (Value);\r
+  if (Value != NULL) {\r
+    FreePool (Value);\r
+  }\r
   return Status;\r
 }\r
 \r
@@ -1983,11 +2001,21 @@ Exit:
     }\r
   }\r
 \r
-  SafeFreePool (GuidStr);\r
-  SafeFreePool (NameStr);\r
-  SafeFreePool (PathStr);\r
-  SafeFreePool (AltIdStr);\r
-  SafeFreePool (Result);\r
+  if (GuidStr != NULL) {\r
+    FreePool (GuidStr);\r
+  }\r
+  if (NameStr != NULL) {\r
+    FreePool (NameStr);\r
+  }\r
+  if (PathStr != NULL) {\r
+    FreePool (PathStr);\r
+  }\r
+  if (AltIdStr != NULL) {\r
+    FreePool (AltIdStr);\r
+  }\r
+  if (Result != NULL) {\r
+    FreePool (Result);\r
+  }\r
 \r
   return Status;\r
 \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index 2a6ec0dfecbb139572c37a3318b6dbe125efc901..5a37dd0ef37b9d369355b67692331b08e81c1f67 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -58,7 +58,7 @@ GenerateHiiDatabaseRecord (
 \r
   DatabaseRecord->PackageList = AllocateZeroPool (sizeof (HII_DATABASE_PACKAGE_LIST_INSTANCE));\r
   if (DatabaseRecord->PackageList == NULL) {\r
-    SafeFreePool (DatabaseRecord);\r
+    FreePool (DatabaseRecord);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -78,8 +78,8 @@ GenerateHiiDatabaseRecord (
   //\r
   HiiHandle = (HII_HANDLE *) AllocateZeroPool (sizeof (HII_HANDLE));\r
   if (HiiHandle == NULL) {\r
-    SafeFreePool (DatabaseRecord->PackageList);\r
-    SafeFreePool (DatabaseRecord);\r
+    FreePool (DatabaseRecord->PackageList);\r
+    FreePool (DatabaseRecord);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   HiiHandle->Signature = HII_HANDLE_SIGNATURE;\r
@@ -340,8 +340,9 @@ InvokeRegisteredFunction (
     }\r
   }\r
 \r
-  SafeFreePool (Buffer);\r
-  Buffer = NULL;\r
+  if (Buffer != NULL) {\r
+    FreePool (Buffer);\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -390,7 +391,7 @@ InsertGuidPackage (
   }\r
   GuidPackage->GuidPkg = (UINT8 *) AllocateZeroPool (PackageHeader.Length);\r
   if (GuidPackage->GuidPkg == NULL) {\r
-    SafeFreePool (GuidPackage);\r
+    FreePool (GuidPackage);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -524,8 +525,8 @@ RemoveGuidPackages (
     RemoveEntryList (&Package->GuidEntry);\r
     CopyMem (&PackageHeader, Package->GuidPkg, sizeof (EFI_HII_PACKAGE_HEADER));\r
     PackageList->PackageListHdr.PackageLength -= PackageHeader.Length;\r
-    SafeFreePool (Package->GuidPkg);\r
-    SafeFreePool (Package);\r
+    FreePool (Package->GuidPkg);\r
+    FreePool (Package);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -579,7 +580,7 @@ InsertFormPackage (
 \r
   FormPackage->IfrData = (UINT8 *) AllocateZeroPool (PackageHeader.Length - sizeof (EFI_HII_PACKAGE_HEADER));\r
   if (FormPackage->IfrData == NULL) {\r
-    SafeFreePool (FormPackage);\r
+    FreePool (FormPackage);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -738,8 +739,8 @@ RemoveFormPackages (
 \r
     RemoveEntryList (&Package->IfrEntry);\r
     PackageList->PackageListHdr.PackageLength -= Package->FormPkgHdr.Length;\r
-    SafeFreePool (Package->IfrData);\r
-    SafeFreePool (Package);\r
+    FreePool (Package->IfrData);\r
+    FreePool (Package);\r
 \r
   }\r
 \r
@@ -809,11 +810,11 @@ InsertStringPackage (
   for (Link = PackageList->StringPkgHdr.ForwardLink; Link != &PackageList->StringPkgHdr; Link = Link->ForwardLink) {\r
     StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);\r
     if (R8_EfiLibCompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {\r
-      SafeFreePool (Language);\r
+      FreePool (Language);\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r
-  SafeFreePool (Language);\r
+  FreePool (Language);\r
 \r
   //\r
   // Create a String package node\r
@@ -876,9 +877,15 @@ InsertStringPackage (
 \r
 Error:\r
 \r
-  SafeFreePool (StringPackage->StringBlock);\r
-  SafeFreePool (StringPackage->StringPkgHdr);\r
-  SafeFreePool (StringPackage);\r
+  if (StringPackage->StringBlock != NULL) {\r
+    FreePool (StringPackage->StringBlock);\r
+  }\r
+  if (StringPackage->StringPkgHdr != NULL) {\r
+    FreePool (StringPackage->StringPkgHdr);\r
+  }\r
+  if (StringPackage != NULL) {\r
+    FreePool (StringPackage);\r
+  }\r
   return Status;\r
 \r
 }\r
@@ -1014,8 +1021,8 @@ RemoveStringPackages (
 \r
     RemoveEntryList (&Package->StringEntry);\r
     PackageList->PackageListHdr.PackageLength -= Package->StringPkgHdr->Header.Length;\r
-    SafeFreePool (Package->StringBlock);\r
-    SafeFreePool (Package->StringPkgHdr);\r
+    FreePool (Package->StringBlock);\r
+    FreePool (Package->StringPkgHdr);\r
     //\r
     // Delete font information\r
     //\r
@@ -1027,10 +1034,10 @@ RemoveStringPackages (
                    HII_FONT_INFO_SIGNATURE\r
                    );\r
       RemoveEntryList (&FontInfo->Entry);\r
-      SafeFreePool (FontInfo);\r
+      FreePool (FontInfo);\r
     }\r
 \r
-    SafeFreePool (Package);\r
+    FreePool (Package);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -1169,11 +1176,21 @@ InsertFontPackage (
 \r
 Error:\r
 \r
-  SafeFreePool (FontPkgHdr);\r
-  SafeFreePool (FontInfo);\r
-  SafeFreePool (FontPackage->GlyphBlock);\r
-  SafeFreePool (FontPackage);\r
-  SafeFreePool (GlobalFont);\r
+  if (FontPkgHdr != NULL) {\r
+    FreePool (FontPkgHdr);\r
+  }\r
+  if (FontInfo != NULL) {\r
+    FreePool (FontInfo);\r
+  }\r
+  if (FontPackage->GlyphBlock != NULL) {\r
+    FreePool (FontPackage->GlyphBlock);\r
+  }\r
+  if (FontPackage != NULL) {\r
+    FreePool (FontPackage);\r
+  }\r
+  if (GlobalFont != NULL) {\r
+    FreePool (GlobalFont);\r
+  }\r
 \r
   return Status;\r
 \r
@@ -1313,8 +1330,11 @@ RemoveFontPackages (
 \r
     RemoveEntryList (&Package->FontEntry);\r
     PackageList->PackageListHdr.PackageLength -= Package->FontPkgHdr->Header.Length;\r
-    SafeFreePool (Package->GlyphBlock);\r
-    SafeFreePool (Package->FontPkgHdr);\r
+\r
+    if (Package->GlyphBlock != NULL) {\r
+      FreePool (Package->GlyphBlock);\r
+    }\r
+    FreePool (Package->FontPkgHdr);\r
     //\r
     // Delete default character cell information\r
     //\r
@@ -1326,7 +1346,7 @@ RemoveFontPackages (
                     HII_GLYPH_INFO_SIGNATURE\r
                     );\r
       RemoveEntryList (&GlyphInfo->Entry);\r
-      SafeFreePool (GlyphInfo);\r
+      FreePool (GlyphInfo);\r
     }\r
 \r
     //\r
@@ -1336,13 +1356,13 @@ RemoveFontPackages (
       GlobalFont = CR (Link, HII_GLOBAL_FONT_INFO, Entry, HII_GLOBAL_FONT_INFO_SIGNATURE);\r
       if (GlobalFont->FontPackage == Package) {\r
         RemoveEntryList (&GlobalFont->Entry);\r
-        SafeFreePool (GlobalFont->FontInfo);\r
-        SafeFreePool (GlobalFont);\r
+        FreePool (GlobalFont->FontInfo);\r
+        FreePool (GlobalFont);\r
         break;\r
       }\r
     }\r
 \r
-    SafeFreePool (Package);\r
+    FreePool (Package);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -1430,7 +1450,7 @@ InsertImagePackage (
 \r
     ImagePackage->PaletteBlock = (UINT8 *) AllocateZeroPool (PaletteSize);\r
     if (ImagePackage->PaletteBlock == NULL) {\r
-      SafeFreePool (ImagePackage);\r
+      FreePool (ImagePackage);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyMem (\r
@@ -1450,8 +1470,8 @@ InsertImagePackage (
                 sizeof (EFI_HII_IMAGE_PACKAGE_HDR) - PaletteSize;\r
     ImagePackage->ImageBlock = (UINT8 *) AllocateZeroPool (ImageSize);\r
     if (ImagePackage->ImageBlock == NULL) {\r
-      SafeFreePool (ImagePackage->PaletteBlock);\r
-      SafeFreePool (ImagePackage);\r
+      FreePool (ImagePackage->PaletteBlock);\r
+      FreePool (ImagePackage);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyMem (\r
@@ -1611,9 +1631,11 @@ RemoveImagePackages (
 \r
   PackageList->PackageListHdr.PackageLength -= Package->ImagePkgHdr.Header.Length;\r
 \r
-  SafeFreePool (Package->ImageBlock);\r
-  SafeFreePool (Package->PaletteBlock);\r
-  SafeFreePool (Package);\r
+  FreePool (Package->ImageBlock);\r
+  if (Package->PaletteBlock != NULL) {\r
+    FreePool (Package->PaletteBlock);\r
+  }\r
+  FreePool (Package);\r
 \r
   PackageList->ImagePkg = NULL;\r
 \r
@@ -1691,8 +1713,12 @@ InsertSimpleFontPackage (
 \r
 Error:\r
 \r
-  SafeFreePool (SimpleFontPackage->SimpleFontPkgHdr);\r
-  SafeFreePool (SimpleFontPackage);\r
+  if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {\r
+    FreePool (SimpleFontPackage->SimpleFontPkgHdr);\r
+  }\r
+  if (SimpleFontPackage != NULL) {\r
+    FreePool (SimpleFontPackage);\r
+  }\r
   return Status;\r
 }\r
 \r
@@ -1817,8 +1843,8 @@ RemoveSimpleFontPackages (
 \r
     RemoveEntryList (&Package->SimpleFontEntry);\r
     PackageList->PackageListHdr.PackageLength -= Package->SimpleFontPkgHdr->Header.Length;\r
-    SafeFreePool (Package->SimpleFontPkgHdr);\r
-    SafeFreePool (Package);\r
+    FreePool (Package->SimpleFontPkgHdr);\r
+    FreePool (Package);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -2003,7 +2029,7 @@ RemoveDevicePathPackage (
   CopyMem (&Header, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
   PackageList->PackageListHdr.PackageLength -= Header.Length;\r
 \r
-  SafeFreePool (Package);\r
+  FreePool (Package);\r
 \r
   PackageList->DevicePathPkg = NULL;\r
 \r
@@ -2132,8 +2158,12 @@ InsertKeyboardLayoutPackage (
 \r
 Error:\r
 \r
-  SafeFreePool (KeyboardLayoutPackage->KeyboardPkg);\r
-  SafeFreePool (KeyboardLayoutPackage);\r
+  if (KeyboardLayoutPackage->KeyboardPkg != NULL) {\r
+    FreePool (KeyboardLayoutPackage->KeyboardPkg);\r
+  }\r
+  if (KeyboardLayoutPackage != NULL) {\r
+    FreePool (KeyboardLayoutPackage);\r
+  }\r
 \r
   return Status;\r
 }\r
@@ -2265,8 +2295,8 @@ RemoveKeyboardLayoutPackages (
     RemoveEntryList (&Package->KeyboardEntry);\r
     CopyMem (&PackageHeader, Package->KeyboardPkg, sizeof (EFI_HII_PACKAGE_HEADER));\r
     PackageList->PackageListHdr.PackageLength -= PackageHeader.Length;\r
-    SafeFreePool (Package->KeyboardPkg);\r
-    SafeFreePool (Package);\r
+    FreePool (Package->KeyboardPkg);\r
+    FreePool (Package);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -2850,9 +2880,9 @@ HiiRemovePackageList (
       ASSERT (Private->HiiHandleCount >= 0);\r
 \r
       HiiHandle->Signature = 0;\r
-      SafeFreePool (HiiHandle);\r
-      SafeFreePool (Node->PackageList);\r
-      SafeFreePool (Node);\r
+      FreePool (HiiHandle);\r
+      FreePool (Node->PackageList);\r
+      FreePool (Node);\r
 \r
       return EFI_SUCCESS;\r
     }\r
@@ -3387,8 +3417,7 @@ HiiUnregisterPackageNotify (
                       NULL\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r
-      SafeFreePool (Notify);\r
-      Notify = NULL;\r
+      FreePool (Notify);\r
 \r
       return EFI_SUCCESS;\r
     }\r
@@ -3670,7 +3699,9 @@ HiiSetKeyboardLayout (
   // Backup current keyboard layout.\r
   //\r
   CopyMem (&Private->CurrentLayoutGuid, KeyGuid, sizeof (EFI_GUID));\r
-  SafeFreePool(Private->CurrentLayout);\r
+  if (Private->CurrentLayout != NULL) {\r
+    FreePool(Private->CurrentLayout);\r
+  }\r
   Private->CurrentLayout = KeyboardLayout;\r
 \r
   //\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index a9d9571f836a0501118a8898bed7e0216ece1748..06b09e7f7625185baedfb912bad3987f26c85c70 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -1024,7 +1024,9 @@ IsSystemFontInfo (
 \r
 Exit:\r
   if (SystemInfo == NULL) {\r
-    SafeFreePool (SystemDefault);    \r
+    if (SystemDefault != NULL) {\r
+      FreePool (SystemDefault);\r
+    }\r
   }\r
   return Flag;\r
 }\r
@@ -1646,7 +1648,9 @@ HiiStringToImage (
     Status = GetGlyphBuffer (Private, *StringPtr, FontInfo, &GlyphBuf[Index], &Cell[Index], &Attributes[Index]);\r
     if (Status == EFI_NOT_FOUND) {\r
       if ((Flags & EFI_HII_IGNORE_IF_NO_GLYPH) == EFI_HII_IGNORE_IF_NO_GLYPH) {\r
-        SafeFreePool (GlyphBuf[Index]);\r
+        if (GlyphBuf[Index] != NULL) {\r
+          FreePool (GlyphBuf[Index]);\r
+        }\r
         GlyphBuf[Index] = NULL;\r
         StringPtr++;\r
       } else {\r
@@ -1871,11 +1875,11 @@ HiiStringToImage (
                                         0\r
                                         );\r
         if (EFI_ERROR (Status)) {\r
-          SafeFreePool (BltBuffer);\r
+          FreePool (BltBuffer);\r
           goto Exit;\r
         }\r
 \r
-        SafeFreePool (BltBuffer);\r
+        FreePool (BltBuffer);\r
 \r
       } else {\r
         for (Index1 = RowInfo[RowIndex].StartIndex; Index1 <= RowInfo[RowIndex].EndIndex; Index1++) {\r
@@ -1938,7 +1942,7 @@ HiiStringToImage (
     Image->Height = 600;\r
     Image->Image.Bitmap = AllocateZeroPool (Image->Width * Image->Height *sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
     if (Image->Image.Bitmap == NULL) {\r
-      SafeFreePool (Image);\r
+      FreePool (Image);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -1970,16 +1974,34 @@ HiiStringToImage (
 Exit:\r
 \r
   for (Index = 0; Index < MAX_STRING_LENGTH; Index++) {\r
-    SafeFreePool (GlyphBuf[Index]);\r
+    if (GlyphBuf[Index] != NULL) {\r
+      FreePool (GlyphBuf[Index]);\r
+    }\r
+  }\r
+  if (StringIn != NULL) {\r
+    FreePool (StringIn);\r
+  }\r
+  if (StringIn2 != NULL) {\r
+    FreePool (StringIn2);\r
+  }\r
+  if (StringInfoOut != NULL) {\r
+    FreePool (StringInfoOut);\r
+  }\r
+  if (RowInfo != NULL) {\r
+    FreePool (RowInfo);\r
+  }\r
+  if (SystemDefault != NULL) {\r
+    FreePool (SystemDefault);\r
+  }\r
+  if (GlyphBuf != NULL) {\r
+    FreePool (GlyphBuf);\r
+  }\r
+  if (Cell != NULL) {\r
+    FreePool (Cell);\r
+  }\r
+  if (Attributes != NULL) {\r
+    FreePool (Attributes);\r
   }\r
-  SafeFreePool (StringIn);\r
-  SafeFreePool (StringIn2);\r
-  SafeFreePool (StringInfoOut);\r
-  SafeFreePool (RowInfo);\r
-  SafeFreePool (SystemDefault);\r
-  SafeFreePool (GlyphBuf);\r
-  SafeFreePool (Cell);\r
-  SafeFreePool (Attributes);\r
 \r
   return Status;\r
 }\r
@@ -2113,7 +2135,7 @@ HiiStringIdToImage (
                                 &StringFontInfo\r
                                 );\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    SafeFreePool (String);\r
+    FreePool (String);\r
     String = (EFI_STRING) AllocateZeroPool (StringSize);\r
     if (String == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
@@ -2180,9 +2202,15 @@ HiiStringIdToImage (
            );\r
 \r
 Exit:\r
-  SafeFreePool (String);\r
-  SafeFreePool (StringFontInfo);\r
-  SafeFreePool (NewStringInfo);\r
+  if (String != NULL) {\r
+    FreePool (String);\r
+  }\r
+  if (StringFontInfo != NULL) {\r
+    FreePool (StringFontInfo);\r
+  }\r
+  if (NewStringInfo != NULL) {\r
+    FreePool (NewStringInfo);\r
+  }\r
 \r
   return Status;\r
 }\r
@@ -2296,7 +2324,7 @@ HiiGetGlyph (
 \r
   Image->Image.Bitmap = AllocateZeroPool (Image->Width * Image->Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
   if (Image->Image.Bitmap == NULL) {\r
-    SafeFreePool (Image);\r
+    FreePool (Image);\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r
@@ -2337,10 +2365,18 @@ Exit:
     }\r
   }\r
 \r
-  SafeFreePool (SystemDefault);\r
-  SafeFreePool (StringInfoOut);\r
-  SafeFreePool (String);\r
-  SafeFreePool (GlyphBuffer);\r
+  if (SystemDefault != NULL) {\r
+   FreePool (SystemDefault);\r
+  }\r
+  if (StringInfoOut != NULL) {\r
+    FreePool (StringInfoOut);\r
+  }\r
+  if (String != NULL) {\r
+    FreePool (String);\r
+  }\r
+  if (GlyphBuffer != NULL) {\r
+    FreePool (GlyphBuffer);\r
+  }\r
 \r
   return Status;\r
 }\r
@@ -2539,8 +2575,12 @@ Exit:
     *FontHandle = LocalFontHandle;\r
   }\r
 \r
-  SafeFreePool (SystemDefault);\r
-  SafeFreePool (FontInfo);\r
+  if (SystemDefault != NULL) {\r
+   FreePool (SystemDefault);\r
+  }\r
+  if (FontInfo != NULL) {\r
+   FreePool (FontInfo);\r
+  }\r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index e570913c6ffdd2fba54fa10e7cb35c552097203f..dc543b80e141b8aeac0f36fae8c6667b56ba76f1 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -288,7 +288,7 @@ Output1bitPixel (
   ZeroMem (PaletteValue, sizeof (PaletteValue));\r
   CopyRgbToGopPixel (&PaletteValue[0], &Palette->PaletteValue[0], 1);\r
   CopyRgbToGopPixel (&PaletteValue[1], &Palette->PaletteValue[1], 1);\r
-  SafeFreePool (Palette);\r
+  FreePool (Palette);\r
 \r
   //\r
   // Convert the pixel from one bit to corresponding color.\r
@@ -373,7 +373,7 @@ Output4bitPixel (
 \r
   ZeroMem (PaletteValue, sizeof (PaletteValue));\r
   CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, PaletteNum);\r
-  SafeFreePool (Palette);\r
+  FreePool (Palette);\r
 \r
   //\r
   // Convert the pixel from 4 bit to corresponding color.\r
@@ -446,7 +446,7 @@ Output8bitPixel (
   PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));\r
   ZeroMem (PaletteValue, sizeof (PaletteValue));\r
   CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, PaletteNum);\r
-  SafeFreePool (Palette);\r
+  FreePool (Palette);\r
 \r
   //\r
   // Convert the pixel from 8 bits to corresponding color.\r
@@ -679,7 +679,7 @@ HiiNewImage (
       ImagePackage->ImageBlock,\r
       ImagePackage->ImageBlockSize - sizeof (EFI_HII_IIBT_END_BLOCK)\r
       );\r
-    SafeFreePool (ImagePackage->ImageBlock);\r
+    FreePool (ImagePackage->ImageBlock);\r
     ImagePackage->ImageBlock = ImageBlock;\r
     ImageBlock += ImagePackage->ImageBlockSize - sizeof (EFI_HII_IIBT_END_BLOCK);\r
     //\r
@@ -687,8 +687,7 @@ HiiNewImage (
     //\r
     NewBlock = AllocateZeroPool (NewBlockSize);\r
     if (NewBlock == NULL) {\r
-      SafeFreePool (ImagePackage->ImageBlock);\r
-      ImagePackage->ImageBlock = NULL;\r
+      FreePool (ImagePackage->ImageBlock);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     NewBlockPtr = NewBlock;\r
@@ -735,7 +734,7 @@ HiiNewImage (
     ImagePackage->ImageBlockSize = (UINT32) BlockSize;\r
     ImagePackage->ImageBlock = (UINT8 *) AllocateZeroPool (BlockSize);\r
     if (ImagePackage->ImageBlock == NULL) {\r
-      SafeFreePool (ImagePackage);\r
+      FreePool (ImagePackage);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     ImageBlock = ImagePackage->ImageBlock;\r
@@ -745,8 +744,8 @@ HiiNewImage (
     //\r
     NewBlock = AllocateZeroPool (NewBlockSize);\r
     if (NewBlock == NULL) {\r
-      SafeFreePool (ImagePackage->ImageBlock);\r
-      SafeFreePool (ImagePackage);\r
+      FreePool (ImagePackage->ImageBlock);\r
+      FreePool (ImagePackage);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     NewBlockPtr = NewBlock;\r
@@ -774,7 +773,7 @@ HiiNewImage (
   CopyGopToRgbPixel ((EFI_HII_RGB_PIXEL *) NewBlock, ImageIn->Bitmap, ImageIn->Width * ImageIn->Height);\r
 \r
   CopyMem (ImageBlock, NewBlockPtr, NewBlockSize);\r
-  SafeFreePool (NewBlockPtr);\r
+  FreePool (NewBlockPtr);\r
 \r
   //\r
   // Append the block end\r
@@ -1156,7 +1155,7 @@ HiiSetImage (
   BlockSize = ImagePackage->ImageBlockSize + NewBlockSize - OldBlockSize;\r
   Block = (UINT8 *) AllocateZeroPool (BlockSize);\r
   if (Block == NULL) {\r
-    SafeFreePool (NewBlock);\r
+    FreePool (NewBlock);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -1169,8 +1168,8 @@ HiiSetImage (
   BlockPtr += NewBlockSize;\r
   CopyMem (BlockPtr, ImageBlock + OldBlockSize, Part2Size);\r
 \r
-  SafeFreePool (ImagePackage->ImageBlock);\r
-  SafeFreePool (NewBlock);\r
+  FreePool (ImagePackage->ImageBlock);\r
+  FreePool (NewBlock);\r
   ImagePackage->ImageBlock     = Block;\r
   ImagePackage->ImageBlockSize = BlockSize;\r
   ImagePackage->ImagePkgHdr.Header.Length += NewBlockSize - OldBlockSize;\r
@@ -1366,7 +1365,7 @@ HiiDrawImage (
 \r
     }\r
 \r
-    SafeFreePool (BltBuffer);\r
+    FreePool (BltBuffer);\r
     return Status;\r
 \r
   } else {\r
@@ -1384,7 +1383,7 @@ HiiDrawImage (
 \r
     ImageOut = (EFI_IMAGE_OUTPUT *) AllocateZeroPool (sizeof (EFI_IMAGE_OUTPUT));\r
     if (ImageOut == NULL) {\r
-      SafeFreePool (BltBuffer);\r
+      FreePool (BltBuffer);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     ImageOut->Width        = (UINT16) Width;\r
@@ -1397,14 +1396,14 @@ HiiDrawImage (
     //\r
     Status = GetSystemFont (Private, &FontInfo, NULL);\r
     if (EFI_ERROR (Status)) {\r
-      SafeFreePool (BltBuffer);\r
-      SafeFreePool (ImageOut);\r
+      FreePool (BltBuffer);\r
+      FreePool (ImageOut);\r
       return Status;\r
     }\r
     for (Index = 0; Index < Width * Height; Index++) {\r
       BltBuffer[Index] = FontInfo->BackgroundColor;\r
     }\r
-    SafeFreePool (FontInfo);\r
+    FreePool (FontInfo);\r
 \r
     //\r
     // Draw the incoming image to the new created image.\r
@@ -1494,7 +1493,9 @@ HiiDrawImageId (
   // Draw this image.\r
   //\r
   Status = HiiDrawImage (This, Flags, &Image, Blt, BltX, BltY);\r
-  SafeFreePool (Image.Bitmap);\r
+  if (Image.Bitmap != NULL) {\r
+    FreePool (Image.Bitmap);\r
+  }\r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index 57b887d8a6b93ce408af3e8ef0c80b5b9762bb3d..d4fcc971e55ea441c6567ccba8543a132d1a60b8 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
@@ -511,7 +511,7 @@ FindStringBlock (
         //        \r
         StringPackage->FontId++;\r
 \r
-        SafeFreePool (FontInfo);\r
+        FreePool (FontInfo);\r
       }\r
 \r
       BlockSize += Ext2.Length;\r
@@ -814,7 +814,7 @@ SetStringWorker (
       TmpSize\r
       );\r
 \r
-    SafeFreePool (StringPackage->StringBlock);\r
+    FreePool (StringPackage->StringBlock);\r
     StringPackage->StringBlock = Block;\r
     StringPackage->StringPkgHdr->Header.Length += (UINT32) (BlockSize - OldBlockSize);\r
     break;\r
@@ -847,7 +847,7 @@ SetStringWorker (
       OldBlockSize - (StringTextPtr - StringPackage->StringBlock) - StringSize\r
       );\r
 \r
-    SafeFreePool (StringPackage->StringBlock);\r
+    FreePool (StringPackage->StringBlock);\r
     StringPackage->StringBlock = Block;\r
     StringPackage->StringPkgHdr->Header.Length += (UINT32) (BlockSize - OldBlockSize);\r
     break;\r
@@ -898,7 +898,7 @@ SetStringWorker (
 \r
   CopyMem (BlockPtr, StringPackage->StringBlock, OldBlockSize);\r
 \r
-  SafeFreePool (StringPackage->StringBlock);\r
+  FreePool (StringPackage->StringBlock);\r
   StringPackage->StringBlock = Block;\r
   StringPackage->StringPkgHdr->Header.Length += Ext2.Length;\r
 \r
@@ -1043,7 +1043,7 @@ HiiNewString (
     HeaderSize = (UINT32) (AsciiStrSize ((CHAR8 *) Language) - 1 + sizeof (EFI_HII_STRING_PACKAGE_HDR));\r
     StringPackage->StringPkgHdr = AllocateZeroPool (HeaderSize);\r
     if (StringPackage->StringPkgHdr == NULL) {\r
-      SafeFreePool (StringPackage);\r
+      FreePool (StringPackage);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     StringPackage->StringPkgHdr->Header.Type      = EFI_HII_PACKAGE_STRINGS;\r
@@ -1063,8 +1063,8 @@ HiiNewString (
     BlockSize     = Ucs2BlockSize + sizeof (EFI_HII_SIBT_END_BLOCK);\r
     StringPackage->StringBlock = (UINT8 *) AllocateZeroPool (BlockSize);\r
     if (StringPackage->StringBlock == NULL) {\r
-      SafeFreePool (StringPackage->StringPkgHdr);\r
-      SafeFreePool (StringPackage);\r
+      FreePool (StringPackage->StringPkgHdr);\r
+      FreePool (StringPackage);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -1139,7 +1139,7 @@ HiiNewString (
     // Append a EFI_HII_SIBT_END block to the end.\r
     //\r
     *BlockPtr = EFI_HII_SIBT_END;\r
-    SafeFreePool (StringPackage->StringBlock);\r
+    FreePool (StringPackage->StringBlock);\r
     StringPackage->StringBlock = StringBlock;\r
     StringPackage->StringPkgHdr->Header.Length += Ucs2BlockSize;\r
     PackageListNode->PackageListHdr.PackageLength += Ucs2BlockSize;\r
@@ -1180,7 +1180,7 @@ HiiNewString (
       // Append a EFI_HII_SIBT_END block to the end.\r
       //\r
       *BlockPtr = EFI_HII_SIBT_END;\r
-      SafeFreePool (StringPackage->StringBlock);\r
+      FreePool (StringPackage->StringBlock);\r
       StringPackage->StringBlock = StringBlock;\r
       StringPackage->StringPkgHdr->Header.Length += Ucs2FontBlockSize;\r
       PackageListNode->PackageListHdr.PackageLength += Ucs2FontBlockSize;\r
@@ -1240,7 +1240,7 @@ HiiNewString (
       // Append a EFI_HII_SIBT_END block to the end.\r
       //\r
       *BlockPtr = EFI_HII_SIBT_END;\r
-      SafeFreePool (StringPackage->StringBlock);\r
+      FreePool (StringPackage->StringBlock);\r
       StringPackage->StringBlock = StringBlock;\r
       StringPackage->StringPkgHdr->Header.Length += FontBlockSize + Ucs2FontBlockSize;\r
       PackageListNode->PackageListHdr.PackageLength += FontBlockSize + Ucs2FontBlockSize;\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index 25d4e0a678f2fc439de691dacf01465a9be9b774..46f70b986bb5064ab95907d91f4df0502b7489fa 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -712,9 +712,15 @@ IfrCatenate (
   Result->Value.string = NewString (StringPtr, FormSet->HiiHandle);\r
 \r
 Done:\r
-  SafeFreePool (String[0]);\r
-  SafeFreePool (String[1]);\r
-  SafeFreePool (StringPtr);\r
+  if (String[0] != NULL) {\r
+    FreePool (String[0]);\r
+  }\r
+  if (String[1] != NULL) {\r
+    FreePool (String[1]);\r
+  }  \r
+  if (StringPtr != NULL) {\r
+    FreePool (StringPtr);\r
+  }\r
 \r
   return Status;\r
 }\r
@@ -770,8 +776,12 @@ IfrMatch (
   Result->Value.b = mUnicodeCollation->MetaiMatch (mUnicodeCollation, String[0], String[1]);\r
 \r
 Done:\r
-  SafeFreePool (String[0]);\r
-  SafeFreePool (String[1]);\r
+  if (String[0] != NULL) {\r
+    FreePool (String[0]);\r
+  }\r
+  if (String[1] != NULL) {\r
+    FreePool (String[1]);\r
+  }  \r
 \r
   return Status;\r
 }\r
@@ -855,8 +865,12 @@ IfrFind (
   }\r
 \r
 Done:\r
-  SafeFreePool (String[0]);\r
-  SafeFreePool (String[1]);\r
+  if (String[0] != NULL) {\r
+    FreePool (String[0]);\r
+  }\r
+  if (String[1] != NULL) {\r
+    FreePool (String[1]);\r
+  }  \r
 \r
   return Status;\r
 }\r
@@ -1025,8 +1039,12 @@ IfrToken (
   Result->Value.string = NewString (SubString, FormSet->HiiHandle);\r
 \r
 Done:\r
-  SafeFreePool (String[0]);\r
-  SafeFreePool (String[1]);\r
+  if (String[0] != NULL) {\r
+    FreePool (String[0]);\r
+  }\r
+  if (String[1] != NULL) {\r
+    FreePool (String[1]);\r
+  }  \r
 \r
   return Status;\r
 }\r
@@ -1129,8 +1147,12 @@ IfrSpan (
   Result->Value.u64 = StringPtr - String[1];\r
 \r
 Done:\r
-  SafeFreePool (String[0]);\r
-  SafeFreePool (String[1]);\r
+  if (String[0] != NULL) {\r
+    FreePool (String[0]);\r
+  }\r
+  if (String[1] != NULL) {\r
+    FreePool (String[1]);\r
+  }  \r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 3a9a8bc3b9c6b686148ee6f6a9c1e39c0583872e..f640d12e3aa9c4a5fbcf496f823e3ca1062cd3d5 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -445,7 +445,9 @@ DestroyExpression (
     OpCode = EXPRESSION_OPCODE_FROM_LINK (Link);
     RemoveEntryList (&OpCode->Link);
 
-    SafeFreePool (OpCode->ValueList);
+    if (OpCode->ValueList != NULL) {
+      FreePool (OpCode->ValueList);
+    }
   }
 
   //
@@ -473,25 +475,41 @@ DestroyStorage (
     return;
   }
 
-  SafeFreePool (Storage->Name);
-  SafeFreePool (Storage->Buffer);
-  SafeFreePool (Storage->EditBuffer);
+  if (Storage->Name != NULL) {
+    FreePool (Storage->Name);
+  }
+  if (Storage->Buffer != NULL) {
+    FreePool (Storage->Buffer);
+  }
+  if (Storage->EditBuffer != NULL) {
+    FreePool (Storage->EditBuffer);
+  }
 
   while (!IsListEmpty (&Storage->NameValueListHead)) {
     Link = GetFirstNode (&Storage->NameValueListHead);
     NameValueNode = NAME_VALUE_NODE_FROM_LINK (Link);
     RemoveEntryList (&NameValueNode->Link);
 
-    SafeFreePool (NameValueNode->Name);
-    SafeFreePool (NameValueNode->Value);
-    SafeFreePool (NameValueNode->EditValue);
-    SafeFreePool (NameValueNode);
+    if (NameValueNode->Name != NULL) {
+      FreePool (NameValueNode->Name);
+    }
+    if (NameValueNode->Value != NULL) {
+      FreePool (NameValueNode->Value);
+    }
+    if (NameValueNode->EditValue != NULL) {
+      FreePool (NameValueNode->EditValue);
+    }
+    FreePool (NameValueNode);
   }
 
-  SafeFreePool (Storage->ConfigHdr);
-  SafeFreePool (Storage->ConfigRequest);
+  if (Storage->ConfigHdr != NULL) {
+    FreePool (Storage->ConfigHdr);
+  }
+  if (Storage->ConfigRequest != NULL) {
+    FreePool (Storage->ConfigRequest);
+  }
 
-  gBS->FreePool (Storage);
+  FreePool (Storage);
 }
 
 
@@ -555,8 +573,12 @@ DestroyStatement (
     DestroyExpression (Expression);
   }
 
-  SafeFreePool (Statement->VariableName);
-  SafeFreePool (Statement->BlockName);
+  if (Statement->VariableName != NULL) {
+    FreePool (Statement->VariableName);
+  }
+  if (Statement->BlockName != NULL) {
+    FreePool (Statement->BlockName);
+  }
 }
 
 
@@ -623,7 +645,7 @@ DestroyFormSet (
   //
   // Free IFR binary buffer
   //
-  SafeFreePool (FormSet->IfrBinaryData);
+  FreePool (FormSet->IfrBinaryData);
 
   //
   // Free FormSet Storage
@@ -664,10 +686,14 @@ DestroyFormSet (
     }
   }
 
-  SafeFreePool (FormSet->StatementBuffer);
-  SafeFreePool (FormSet->ExpressionBuffer);
+  if (FormSet->StatementBuffer != NULL) {
+    FreePool (FormSet->StatementBuffer);
+  }
+  if (FormSet->ExpressionBuffer != NULL) {
+    FreePool (FormSet->ExpressionBuffer);
+  }
 
-  SafeFreePool (FormSet);
+  FreePool (FormSet);
 }
 
 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 404bb31e1011c1471442a98b268969674a40dde3..ba6927c7193e2667ac3bdc6564e1f9a9d86ab198 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -611,34 +611,34 @@ FreeBrowserStrings (
   VOID\r
   )\r
 {\r
-  SafeFreePool (gFunctionOneString);\r
-  SafeFreePool (gFunctionTwoString);\r
-  SafeFreePool (gFunctionNineString);\r
-  SafeFreePool (gFunctionTenString);\r
-  SafeFreePool (gEnterString);\r
-  SafeFreePool (gEnterCommitString);\r
-  SafeFreePool (gEscapeString);\r
-  SafeFreePool (gMoveHighlight);\r
-  SafeFreePool (gMakeSelection);\r
-  SafeFreePool (gDecNumericInput);\r
-  SafeFreePool (gHexNumericInput);\r
-  SafeFreePool (gToggleCheckBox);\r
-  SafeFreePool (gPromptForData);\r
-  SafeFreePool (gPromptForPassword);\r
-  SafeFreePool (gPromptForNewPassword);\r
-  SafeFreePool (gConfirmPassword);\r
-  SafeFreePool (gPassowordInvalid);\r
-  SafeFreePool (gConfirmError);\r
-  SafeFreePool (gPressEnter);\r
-  SafeFreePool (gEmptyString);\r
-  SafeFreePool (gAreYouSure);\r
-  SafeFreePool (gYesResponse);\r
-  SafeFreePool (gNoResponse);\r
-  SafeFreePool (gMiniString);\r
-  SafeFreePool (gPlusString);\r
-  SafeFreePool (gMinusString);\r
-  SafeFreePool (gAdjustNumber);\r
-  SafeFreePool (gSaveChanges);\r
+  FreePool (gFunctionOneString);\r
+  FreePool (gFunctionTwoString);\r
+  FreePool (gFunctionNineString);\r
+  FreePool (gFunctionTenString);\r
+  FreePool (gEnterString);\r
+  FreePool (gEnterCommitString);\r
+  FreePool (gEscapeString);\r
+  FreePool (gMoveHighlight);\r
+  FreePool (gMakeSelection);\r
+  FreePool (gDecNumericInput);\r
+  FreePool (gHexNumericInput);\r
+  FreePool (gToggleCheckBox);\r
+  FreePool (gPromptForData);\r
+  FreePool (gPromptForPassword);\r
+  FreePool (gPromptForNewPassword);\r
+  FreePool (gConfirmPassword);\r
+  FreePool (gPassowordInvalid);\r
+  FreePool (gConfirmError);\r
+  FreePool (gPressEnter);\r
+  FreePool (gEmptyString);\r
+  FreePool (gAreYouSure);\r
+  FreePool (gYesResponse);\r
+  FreePool (gNoResponse);\r
+  FreePool (gMiniString);\r
+  FreePool (gPlusString);\r
+  FreePool (gMinusString);\r
+  FreePool (gAdjustNumber);\r
+  FreePool (gSaveChanges);\r
   return ;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index f728d53910eff770021702eb195a10a1cc89141c..29b606fdeff06b5112641ea3068ebd5a643d0b39 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -724,7 +724,9 @@ NewStringCpy (
   IN CHAR16           *Src\r
   )\r
 {\r
-  SafeFreePool (*Dest);\r
+  if (*Dest != NULL) {\r
+    FreePool (*Dest);\r
+  }\r
   *Dest = AllocateCopyPool (StrSize (Src), Src);\r
   ASSERT (*Dest != NULL);\r
 }\r
@@ -865,7 +867,9 @@ SetValueByName (
     Node = NAME_VALUE_NODE_FROM_LINK (Link);\r
 \r
     if (StrCmp (Name, Node->Name) == 0) {\r
-      SafeFreePool (Node->EditValue);\r
+      if (Node->EditValue != NULL) {\r
+        FreePool (Node->EditValue);\r
+      }\r
       Node->EditValue = AllocateCopyPool (StrSize (Value), Value);\r
       ASSERT (Node->EditValue != NULL);\r
       return EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 8421ad977702e4771877613bbbea6aec28dca5c9..390d551386da5bd1c003db49ac04b068f289f585 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -2137,7 +2137,9 @@ UiDisplayMenu (
             gDirection = SCAN_LEFT;\r
           }\r
           Status = ProcessOptions (Selection, MenuOption, TRUE, &OptionString);\r
-          SafeFreePool (OptionString);\r
+          if (OptionString != NULL) {\r
+            FreePool (OptionString);\r
+          }\r
         }\r
         break;\r
 \r