From e4f95ca5278fd5c539d294e4545a9cd2f4473ba4 Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 16 Sep 2011 01:22:39 +0000
Subject: [PATCH] Refine the logic about getting Value info to avoid check data
 error.

Signed-off-by: ydong10
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12360 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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