ShellPkg/for: Fix potential null pointer deference

[mirror_edk2.git] / ShellPkg / Library / UefiHandleParsingLib / UefiHandleParsingLib.c

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 15103160d9b0d2f96312eb9a01e6889413895cf7..b7b0246ac93af5cadb5a5c1b994d5143247893df 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -259,9 +259,7 @@ LoadedImageProtocolDumpInformation(
     } else {\r
       SHELL_FREE_NON_NULL(FilePath);\r
     }\r
-    RetVal = CatSPrint(NULL, FileName);\r
-    SHELL_FREE_NON_NULL(FileName);\r
-    return RetVal;\r
+    return FileName;\r
   }\r
 \r
   HandleParsingHiiInit();\r
@@ -684,7 +682,7 @@ PciRootBridgeIoDumpInformation(
         break;\r
       }\r
       if (Temp != NULL) {\r
-        Temp2 = CatSPrint(RetVal, L"%s", Temp);\r
+        Temp2 = CatSPrint(RetVal, L"\r\n%s", Temp);\r
         FreePool(Temp);\r
         FreePool(RetVal);\r
         RetVal = Temp2;\r
@@ -692,7 +690,7 @@ PciRootBridgeIoDumpInformation(
       }\r
 \r
       Temp2 = CatSPrint(RetVal,\r
-        L"\r\n%%H%02x    %016lx  %016lx  %02x%%N",\r
+        L"%%H%02x    %016lx  %016lx  %02x%%N",\r
         Configuration->SpecificFlag,\r
         Configuration->AddrRangeMin,\r
         Configuration->AddrRangeMax,\r