summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2015-09-17 01:08:54 +0000
committerydong10 <ydong10@Edk2>2015-09-17 01:08:54 +0000
commit3f4288fe261a744289ccff7bf66cce9276e217e8 (patch)
tree9104b8e0cb6d6db03df8adfc9381c03ae5a1f49b
parent2f667c5488c81924861901d4d7c6f4bb170ffb69 (diff)
downloadedk2-3f4288fe261a744289ccff7bf66cce9276e217e8.zip
edk2-3f4288fe261a744289ccff7bf66cce9276e217e8.tar.gz
edk2-3f4288fe261a744289ccff7bf66cce9276e217e8.tar.bz2
MdeModulePkg/HiiDatabase: Fix Progress not point to the correct place issue.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18488 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c10
1 files 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
@@ -2979,6 +2979,8 @@ EfiConfigKeywordHandlerSetData (
*ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done:
+ *Progress = KeywordString + (StringPtr - TempString);
+
ASSERT (TempString != NULL);
FreePool (TempString);
if (NameSpace != NULL) {
@@ -2998,8 +3000,8 @@ Done:
}
if (MultiConfigResp != NULL && MultiConfigResp != ConfigResp) {
FreePool (MultiConfigResp);
- }
- *Progress = StringPtr;
+ }
+
return Status;
}
@@ -3271,6 +3273,8 @@ EfiConfigKeywordHandlerGetData (
*ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done:
+ *Progress = KeywordString + (StringPtr - TempString);
+
if (TempString != NULL) {
FreePool (TempString);
}
@@ -3283,6 +3287,6 @@ Done:
if (KeywordData != NULL) {
FreePool (KeywordData);
}
- *Progress = StringPtr;
+
return Status;
}