]> git.proxmox.com Git - mirror_edk2.git/commitdiff
MdeModulePkg/HiiDatabaseDxe: Correct the ReallocatePool size
authorDandan Bi <dandan.bi@intel.com>
Tue, 12 Apr 2016 02:53:42 +0000 (10:53 +0800)
committerStar Zeng <star.zeng@intel.com>
Tue, 19 Apr 2016 09:53:58 +0000 (17:53 +0800)
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c

index 3a871cf3baed0e723da11076110c95632d56c76a..4ed4eccdc2cafb848239afbc23ac574fd47e91b6 100644 (file)
@@ -600,11 +600,11 @@ MergeDefaultString (
     if (StringPtr == NULL) {\r
       StringPtrEnd   = StrStr (StringPtrDefault + 1, L"&GUID");\r
       SizeAltCfgResp = StrSize (*AltCfgResp);\r
-      TotalSize = SizeAltCfgResp + StrSize (StringPtrDefault);\r
       if (StringPtrEnd == NULL) {\r
         //\r
         // No more default string is found.\r
         //\r
+        TotalSize = SizeAltCfgResp + StrSize (StringPtrDefault);\r
         *AltCfgResp    = (EFI_STRING) ReallocatePool (\r
                                      SizeAltCfgResp,\r
                                      TotalSize,\r
@@ -619,6 +619,7 @@ MergeDefaultString (
       } else {\r
         TempChar = *StringPtrEnd;\r
         *StringPtrEnd = L'\0';\r
+        TotalSize = SizeAltCfgResp + StrSize (StringPtrDefault);\r
         *AltCfgResp = (EFI_STRING) ReallocatePool (\r
                                      SizeAltCfgResp,\r
                                      TotalSize,\r