MdeModulePkg/SetupBrowser:Add NULL check before using a pointer

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Setup.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 48beeb6539d19f9b703d385d0b2258d3259fb6c3..c2cfa5c5c829c582f0bbc804d30e8f0f838f89ed 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1486,7 +1486,9 @@ BufferToValue (
     //\r
     if (Question->QuestionReferToBitField) {\r
       Buffer = (UINT8 *)AllocateZeroPool (Question->StorageWidth);\r
-      ASSERT (Buffer != NULL);\r
+      if (Buffer == NULL) {\r
+        return EFI_OUT_OF_RESOURCES;\r
+      }\r
       Dst = Buffer;\r
     } else {\r
       Dst = (UINT8 *) &Question->HiiValue.Value;\r
@@ -1548,11 +1550,9 @@ BufferToValue (
 \r
   *StringPtr = TempChar;\r
 \r
-  if (Question->QuestionReferToBitField) {\r
+  if (Buffer != NULL && Question->QuestionReferToBitField) {\r
     GetBitsQuestionValue (Question, Buffer);\r
-    if (Buffer != NULL) {\r
-      FreePool (Buffer);\r
-    }\r
+    FreePool (Buffer);\r
   }\r
 \r
   return Status;\r