Refine the logic about getting Value info to avoid check data error.

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 88f965059f1dd1c41e9e8433d9be9a94fbe5cb78..2b0f052060972bdfd31cea3ddb25bbc50cea9b83 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1447,12 +1447,18 @@ GetQuestionValue (
       //\r
       // Skip <ConfigRequest>\r
       //\r
-      Value = Result + Length;\r
       if (IsBufferStorage) {\r
+        Value = StrStr (Result, L"&VALUE");\r
+        if (Value == NULL) {\r
+          FreePool (Result);\r
+          return EFI_NOT_FOUND;\r
+        }\r
         //\r
         // Skip "&VALUE"\r
         //\r
         Value = Value + 6;\r
+      } else {\r
+        Value = Result + Length;\r
       }\r
       if (*Value != '=') {\r
         FreePool (Result);\r