Add checking for memory allocation in UI modules.

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

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
index 5f3823c612875e1c95470dbf30a1d6d433e6618b..c383d1660ae639eb72ba00185f6f30a4bdc6219e 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
@@ -94,11 +94,13 @@ Returns:
     // Need some memory for OptionList. Allow for up to 8 options.\r
     //\r
     OptionList = AllocateZeroPool (sizeof (IFR_OPTION) * 8);\r
+    ASSERT (OptionList != NULL);\r
 \r
     //\r
     // Allocate space for creation of Buffer\r
     //\r
     UpdateData = AllocateZeroPool (0x1000);\r
+    ASSERT (UpdateData != NULL);\r
 \r
     //\r
     // Remove all the op-codes starting with Label 0x2222 to next Label (second label is for convenience\r
@@ -170,11 +172,13 @@ Returns:
     // Need some memory for OptionList. Allow for up to 8 options.\r
     //\r
     OptionList = AllocateZeroPool (sizeof (IFR_OPTION) * 8);\r
+    ASSERT (OptionList != NULL);\r
 \r
     //\r
     // Allocate space for creation of Buffer\r
     //\r
     UpdateData = AllocateZeroPool (0x1000);\r
+    ASSERT (UpdateData != NULL);\r
 \r
     //\r
     // Remove all the op-codes starting with Label 0x2222 to next Label (second label is for convenience\r
@@ -244,6 +248,7 @@ Returns:
                     0x1000,\r
                     (VOID **) &UpdateData\r
                     );\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
     ZeroMem (UpdateData, 0x1000);\r
 \r
@@ -297,6 +302,7 @@ Returns:
                     0x1000,\r
                     (VOID **)&UpdateData\r
                     );\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
     ZeroMem (UpdateData, 0x1000);\r
 \r
@@ -366,6 +372,7 @@ Returns:
                     sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2,\r
                     (VOID **) Packet\r
                     );\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
     ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2);\r
 \r
@@ -384,6 +391,7 @@ Returns:
                     sizeof (EFI_HII_CALLBACK_PACKET) + 2,\r
                     (VOID **) Packet\r
                     );\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
     ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + 2);\r
 \r
@@ -585,6 +593,7 @@ DriverSampleInit (
                   0x1000,\r
                   (VOID **) &UpdateData\r
                   );\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   ZeroMem (UpdateData, 0x1000);\r
 \r

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
index 2c625fe86e2008a2b3cf52f36b840e67ffaab575..4178284a494017b285de7924370d9f8739bf9c51 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
@@ -1409,6 +1409,8 @@ Returns:
   TempBufferSize += PackageInstance->IfrSize + PackageInstance->StringSize;\r
 \r
   TempBuffer      = AllocateZeroPool (TempBufferSize);\r
+  ASSERT (TempBuffer != NULL);\r
+\r
   OrigTempBuffer  = TempBuffer;\r
 \r
   //\r

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c
index d84fcf02b11ea64e37a16877de49a42b21740fad..466039f8dcb56e75d8a5c2258a506993f01530a3 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c
@@ -1233,6 +1233,7 @@ GetSelectionInputPopUp (
         //\r
         if (StrLen (StringPtr) > (PopUpWidth - 1)) {\r
           TempStringPtr = AllocateZeroPool (sizeof (CHAR16) * (PopUpWidth - 1));\r
+          ASSERT (TempStringPtr != NULL);\r
           CopyMem (TempStringPtr, StringPtr, (sizeof (CHAR16) * (PopUpWidth - 5)));\r
           gBS->FreePool (StringPtr);\r
           StringPtr = TempStringPtr;\r

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
index 7a2ec044034acabb65bd0bb8df424b8f129a6830..369d2b4911b6c8831492a728eb905427e061b5d8 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
@@ -3003,7 +3003,10 @@ Returns:
         FileFormTags->VariableDefinitions->VariableFakeSize = (UINT16) (FileFormTags->VariableDefinitions->VariableFakeSize + FileFormTags->VariableDefinitions->VariableSize);\r
         \r
         FileFormTags->VariableDefinitions->NvRamMap = AllocateZeroPool (FileFormTags->VariableDefinitions->VariableSize);\r
+        ASSERT (FileFormTags->VariableDefinitions->NvRamMap != NULL);\r
+\r
         FileFormTags->VariableDefinitions->FakeNvRamMap = AllocateZeroPool (NvMapSize + FileFormTags->VariableDefinitions->VariableFakeSize);\r
+        ASSERT (FileFormTags->VariableDefinitions->FakeNvRamMap != NULL);\r
 \r
         CopyMem (FileFormTags->VariableDefinitions->NvRamMap, NvMap, NvMapSize);\r
         gBS->FreePool (NvMapListHead);\r