[edk2] [Patch 1/3] Update Progress to point to the correct return position.

[Eric Dong]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.d...@intel.com>
---
 MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c 
b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
index e88a0c4..ccd6f82 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
@@ -2977,10 +2977,12 @@ EfiConfigKeywordHandlerSetData (
   }
   
   *ProgressErr = KEYWORD_HANDLER_NO_ERROR;
 
 Done:
+  *Progress = KeywordString + (StringPtr - TempString);
+
   ASSERT (TempString != NULL);
   FreePool (TempString);
   if (NameSpace != NULL) {
     FreePool (NameSpace);
   }
@@ -2996,12 +2998,12 @@ Done:
   if (ConfigResp != NULL) {
     FreePool (ConfigResp);
   }
   if (MultiConfigResp != NULL && MultiConfigResp != ConfigResp) {
     FreePool (MultiConfigResp);
-  }  
-  *Progress = StringPtr;
+  }
+  
   return Status;
 }
 
 /**
 
@@ -3269,10 +3271,12 @@ EfiConfigKeywordHandlerGetData (
   }
 
   *ProgressErr = KEYWORD_HANDLER_NO_ERROR;
 
 Done:
+  *Progress = KeywordString + (StringPtr - TempString);
+
   if (TempString != NULL) {
     FreePool (TempString);
   }
   if (NameSpace != NULL) {
     FreePool (NameSpace);
@@ -3281,8 +3285,8 @@ Done:
     FreePool (DevicePath);
   }
   if (KeywordData != NULL) {
     FreePool (KeywordData);
   }
-  *Progress = StringPtr;
+
   return Status;
 }
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel