diff options
| author | Eric Dong <eric.dong@intel.com> | 2015-09-17 02:11:22 +0000 |
|---|---|---|
| committer | hwu1225 <hwu1225@Edk2> | 2015-09-17 02:11:22 +0000 |
| commit | 1e15a0e60edae01782782ea3b5012c7032a660b2 (patch) | |
| tree | 9198c62c1a22f23e0e76cd65f340eda23dcb57ed /MdeModulePkg | |
| parent | 0fb361d8281b4b5cf919c7fbbd3b5f72f6403990 (diff) | |
| download | edk2-platforms-1e15a0e60edae01782782ea3b5012c7032a660b2.tar.xz | |
MdeModulePkg/HiiDatabase: Fix Progress not point to the correct place issue.
(Sync patch r18488 from main trunk.)
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/branches/UDK2015@18492 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index e88a0c4597..ccd6f820c6 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;
}
|