MdeModulePkg/HiiDatabaseDxe:remove dead code block

[mirror_edk2.git] / MdeModulePkg / Universal / HiiDatabaseDxe / ConfigRouting.c

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 71ea25bc19bfb17899ceef3a89464f5eb4d6f3e8..17a914208c6d68db8b5debe6af1ae0d2017ec372 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -909,6 +909,7 @@ CompareAndMergeDefaultString (
   // To find the <AltResp> with AltConfigHdr in AltCfgResp, ignore other <AltResp> which follow it.\r
   //\r
   StringPtr = StrStr (*AltCfgResp, AltConfigHdr);\r
+  ASSERT (StringPtr != NULL);\r
   StringPtrNext = StrStr (StringPtr + 1, L"&GUID");\r
   if (StringPtrNext != NULL) {\r
     TempCharA = *StringPtrNext;\r
@@ -2870,9 +2871,6 @@ ParseIfrData (
         //\r
         if ((BlockData->Name == NULL) && ((BlockData->Offset + BlockData->Width) > VarStorageData->Size)) {\r
           Status = EFI_INVALID_PARAMETER;\r
-          if (BlockData->Name != NULL) {\r
-            FreePool (BlockData->Name);\r
-          }\r
           FreePool (BlockData);\r
           goto Done;\r
         }\r
@@ -5496,7 +5494,6 @@ HiiBlockToConfig (
   UINTN                               Index;\r
   UINT8                               *TemBuffer;\r
   CHAR16                              *TemString;\r
-  CHAR16                              TemChar;\r
 \r
   TmpBuffer = NULL;\r
 \r
@@ -5563,10 +5560,13 @@ HiiBlockToConfig (
   //\r
   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>\r
   //\r
-  TemChar = *StringPtr;\r
-  *StringPtr = '\0';\r
-  AppendToMultiString(Config, ConfigRequest);\r
-  *StringPtr = TemChar;\r
+  TemString = AllocateCopyPool (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);\r
+  if (TemString == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+  TemString[StringPtr - ConfigRequest] = '\0';\r
+  AppendToMultiString(Config, TemString);\r
+  FreePool (TemString);\r
 \r
   //\r
   // Parse each <RequestElement> if exists\r