Remove SafeFreePool from MemoryAllocationLib as this API's name is misleading. Its implementation only check if a pointer is NULL. If a garbage pointer is passed in, the gBS->FreePool will still ASSERT in debug build and return error code.

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

1 files changed, 38 insertions, 30 deletions

diff --git a/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c b/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c
index 8a7c0d7ad6..c8b2c59f52 100644
--- a/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/MdeModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -173,7 +173,7 @@ BdsLibBootViaBootOption (
   Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gEfiShellFileGuid);

   if (!EFI_ERROR(Status)) {

     if (Option->DevicePath != NULL) {

-      SafeFreePool(Option->DevicePath);

+      FreePool(Option->DevicePath);

     }

     Option->DevicePath  = AllocateZeroPool (GetDevicePathSize (DevicePath));

     CopyMem (Option->DevicePath, DevicePath, GetDevicePathSize (DevicePath));

@@ -186,7 +186,7 @@ BdsLibBootViaBootOption (
     //

     // free the temporary device path created by BdsLibUpdateFvFileDevicePath()

     //

-    SafeFreePool (DevicePath); 

+    FreePool (DevicePath); 

     DevicePath = Option->DevicePath;

   }

 

@@ -358,7 +358,7 @@ BdsExpandPartitionPartialDevicePathToFull (
       // Come here means the first instance is not matched

       //

       NeedAdjust = TRUE;

-      SafeFreePool(Instance);

+      FreePool(Instance);

     } while (TempNewDevicePath != NULL);

 

     if (DeviceExist) {

@@ -378,14 +378,14 @@ BdsExpandPartitionPartialDevicePathToFull (
         //

         TempNewDevicePath = CachedDevicePath;

         CachedDevicePath  = BdsLibDelPartMatchInstance (CachedDevicePath, Instance );

-        SafeFreePool (TempNewDevicePath);

+        FreePool (TempNewDevicePath);

         

         //

         // Second, append the remaining parth after the matched instance

         //

         TempNewDevicePath = CachedDevicePath;

         CachedDevicePath = AppendDevicePathInstance (Instance, CachedDevicePath );

-        SafeFreePool (TempNewDevicePath);

+        FreePool (TempNewDevicePath);

         //

         // Save the matching Device Path so we don't need to do a connect all next time

         //

@@ -398,8 +398,8 @@ BdsExpandPartitionPartialDevicePathToFull (
                         );

       }

       

-      SafeFreePool (Instance);

-      SafeFreePool (CachedDevicePath);

+      FreePool (Instance);

+      FreePool (CachedDevicePath);

       return FullDevicePath;

     }

   }

@@ -444,15 +444,15 @@ BdsExpandPartitionPartialDevicePathToFull (
         if (BdsLibMatchDevicePaths (CachedDevicePath, BlockIoDevicePath)) {

           TempNewDevicePath = CachedDevicePath;

           CachedDevicePath = BdsLibDelPartMatchInstance (CachedDevicePath, BlockIoDevicePath);

-          SafeFreePool(TempNewDevicePath);

+          FreePool(TempNewDevicePath);

 

           TempNewDevicePath = CachedDevicePath;

           CachedDevicePath = AppendDevicePathInstance (BlockIoDevicePath, CachedDevicePath);

-          SafeFreePool(TempNewDevicePath);

+          FreePool(TempNewDevicePath);

         } else {

           TempNewDevicePath = CachedDevicePath;

           CachedDevicePath = AppendDevicePathInstance (BlockIoDevicePath, CachedDevicePath);

-          SafeFreePool(TempNewDevicePath);

+          FreePool(TempNewDevicePath);

         }

         //

         // Here limit the device path instance number to 12, which is max number for a system support 3 IDE controller

@@ -496,8 +496,10 @@ BdsExpandPartitionPartialDevicePathToFull (
     }

   }

   

-  SafeFreePool (CachedDevicePath);

-  SafeFreePool (BlockIoBuffer);

+  FreePool (CachedDevicePath);

+  if (BlockIoBuffer != NULL) {

+    FreePool (BlockIoBuffer);

+  }

   return FullDevicePath;

 }

 

@@ -649,7 +651,7 @@ BdsLibDeleteOptionFromHandle (
                       );

                       

     if (BootOptionVar == NULL) {

-      SafeFreePool (BootOrder);

+      FreePool (BootOrder);

       return EFI_OUT_OF_RESOURCES;

     }

 

@@ -665,11 +667,11 @@ BdsLibDeleteOptionFromHandle (
     if ((OptionDevicePathSize == DevicePathSize) &&

         (CompareMem (DevicePath, OptionDevicePath, DevicePathSize) == 0)) {

       BdsDeleteBootOption (BootOrder[Index], BootOrder, &BootOrderSize);

-      SafeFreePool (BootOptionVar);

+      FreePool (BootOptionVar);

       break;

     }

 

-    SafeFreePool (BootOptionVar);

+    FreePool (BootOptionVar);

     Index++;

   }

 

@@ -684,7 +686,7 @@ BdsLibDeleteOptionFromHandle (
                   BootOrder

                   );

 

-  SafeFreePool (BootOrder);

+  FreePool (BootOrder);

 

   return Status;

 }

@@ -741,7 +743,7 @@ BdsDeleteAllInvalidEfiBootOption (
                       &BootOptionSize

                       );

     if (NULL == BootOptionVar) {

-      SafeFreePool (BootOrder);

+      FreePool (BootOrder);

       return EFI_OUT_OF_RESOURCES;

     }

 

@@ -755,7 +757,7 @@ BdsDeleteAllInvalidEfiBootOption (
     //

     if ((DevicePathType (OptionDevicePath) == BBS_DEVICE_PATH) &&

         (DevicePathSubType (OptionDevicePath) == BBS_BBS_DP)) {

-      SafeFreePool (BootOptionVar);

+      FreePool (BootOptionVar);

       Index++;

       continue;

     }

@@ -777,7 +779,7 @@ BdsDeleteAllInvalidEfiBootOption (
       BootOrder[Index] = 0xffff;

     }

 

-    SafeFreePool (BootOptionVar);

+    FreePool (BootOptionVar);

     Index++;

   }

 

@@ -799,7 +801,7 @@ BdsDeleteAllInvalidEfiBootOption (
                   BootOrder

                   );

 

-  SafeFreePool (BootOrder);

+  FreePool (BootOrder);

 

   return Status;

 }

@@ -963,7 +965,7 @@ BdsLibEnumerateAllBootOption (
   }

 

   if (NumberBlockIoHandles != 0) {

-    SafeFreePool (BlockIoHandles);

+    FreePool (BlockIoHandles);

   }

 

   //

@@ -1025,7 +1027,7 @@ BdsLibEnumerateAllBootOption (
   }

 

   if (NumberFileSystemHandles != 0) {

-    SafeFreePool (FileSystemHandles);

+    FreePool (FileSystemHandles);

   }

 

   //

@@ -1048,7 +1050,7 @@ BdsLibEnumerateAllBootOption (
   }

 

   if (NumberSimpleNetworkHandles != 0) {

-    SafeFreePool (SimpleNetworkHandles);

+    FreePool (SimpleNetworkHandles);

   }

 

   //

@@ -1102,7 +1104,7 @@ BdsLibEnumerateAllBootOption (
   }

 

   if (FvHandleCount != 0) {

-    SafeFreePool (FvHandleBuffer);

+    FreePool (FvHandleBuffer);

   }

   //

   // Make sure every boot only have one time

@@ -1307,7 +1309,7 @@ BdsLibGetBootableHandle (
                BlockIo->Media->BlockSize,

                Buffer

                );

-      SafeFreePool(Buffer);

+      FreePool(Buffer);

     }

   }

 

@@ -1320,6 +1322,8 @@ BdsLibGetBootableHandle (
   // Try to locate the USB node device path first, if fail then use its previour PCI node to search

   //

   DupDevicePath = DuplicateDevicePath (DevicePath);

+  ASSERT (DupDevicePath != NULL);

+  

   UpdatedDevicePath = DupDevicePath;

   Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);

   //

@@ -1379,9 +1383,11 @@ BdsLibGetBootableHandle (
     }

   }

 

-  SafeFreePool(DupDevicePath);

+  FreePool(DupDevicePath);

 

-  SafeFreePool(SimpleFileSystemHandles);

+  if (SimpleFileSystemHandles != NULL) {

+    FreePool(SimpleFileSystemHandles);

+  }

 

   return ReturnHandle;

 }

@@ -1640,7 +1646,7 @@ BdsLibIsValidEFIBootOptDevicePath (
       return TRUE;

     } else {

       if (Status == EFI_SUCCESS) {

-        SafeFreePool (TempDevicePath); 

+        FreePool (TempDevicePath); 

       }

       return FALSE;

     }

@@ -1885,8 +1891,10 @@ BdsLibUpdateFvFileDevicePath (
       FoundFvHandle = FvHandleBuffer[Index];

       break;

     }

-    

-    SafeFreePool (FvHandleBuffer);  

+

+    if (FvHandleBuffer != NULL) {

+      FreePool (FvHandleBuffer);  

+    }

   }

 

   if (FindFvFile) {