Revision: 18492
http://sourceforge.net/p/edk2/code/18492
Author: hwu1225
Date: 2015-09-17 02:11:22 +0000 (Thu, 17 Sep 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18488
Modified Paths:
--------------
branches/UDK2015/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
Modified:
branches/UDK2015/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
===================================================================
---
branches/UDK2015/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
2015-09-17 01:42:59 UTC (rev 18491)
+++
branches/UDK2015/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
2015-09-17 02:11:22 UTC (rev 18492)
@@ -2979,6 +2979,8 @@
*ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done:
+ *Progress = KeywordString + (StringPtr - TempString);
+
ASSERT (TempString != NULL);
FreePool (TempString);
if (NameSpace != NULL) {
@@ -2998,8 +3000,8 @@
}
if (MultiConfigResp != NULL && MultiConfigResp != ConfigResp) {
FreePool (MultiConfigResp);
- }
- *Progress = StringPtr;
+ }
+
return Status;
}
@@ -3271,6 +3273,8 @@
*ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done:
+ *Progress = KeywordString + (StringPtr - TempString);
+
if (TempString != NULL) {
FreePool (TempString);
}
@@ -3283,6 +3287,6 @@
if (KeywordData != NULL) {
FreePool (KeywordData);
}
- *Progress = StringPtr;
+
return Status;
}
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
