Another test version (using bufsize=1) trying to solve the non-existence issue of...

[mirror_edk2.git] / MdeModulePkg / Universal / PlatformDriverOverride / PlatOverMngr / PlatOverMngr.c

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
index a55e2ea0cb06d838d0846b88447db25fb03e71e6..e4ea60cff2ad75457a066fdaec47606455562d6d 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
@@ -468,6 +468,7 @@ UpdateDeviceSelectPage (
     //\r
     Len = StrSize (ControllerName);\r
     NewString = AllocateZeroPool (Len + StrSize (L"--"));\r
+    ASSERT (NewString != NULL);\r
     if (EFI_ERROR (CheckMapping (ControllerDevicePath,NULL, &mMappingDataBase, NULL, NULL))) {\r
       StrCat (NewString, L"--");\r
     } else {\r
@@ -762,6 +763,7 @@ UpdateBindingDriverSelectPage (
     // First create the driver image name\r
     //\r
     NewString = AllocateZeroPool (StrSize (DriverName));\r
+    ASSERT (NewString != NULL); \r
     if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) {\r
       FakeNvData->DriSelection[Index] = 0x00;\r
     } else {\r
@@ -894,7 +896,7 @@ UpdatePrioritySelectPage (
   }\r
   \r
   IfrOptionList = AllocateZeroPool (sizeof (IFR_OPTION) * mSelectedDriverImageNum);\r
-  ASSERT_EFI_ERROR (IfrOptionList != NULL);\r
+  ASSERT (IfrOptionList != NULL);\r
   //\r
   // Create order list for those selected drivers\r
   //\r
@@ -975,7 +977,7 @@ UpdatePrioritySelectPage (
     EFI_IFR_FLAG_RESET_REQUIRED,\r
     0,\r
     EFI_IFR_NUMERIC_SIZE_1,\r
-    MAX_CHOICE_NUM,\r
+    (UINT8) MAX_CHOICE_NUM,\r
     IfrOptionList,\r
     SelectedDriverImageNum,\r
     &UpdateData\r