ShellPkg/Dp: Add null pointer check

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / Unload.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
index 4f0ec1203f16730c4ca047b143f4af43a5fb3db3..b5f085a750eb56e04754c0db6b51dd23c9b8d23e 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
@@ -1,7 +1,8 @@
 /** @file\r
   Main file for Unload shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -23,47 +24,18 @@
   @retval EFI_INVALID_PARAMETER     The handle did not have LoadedImage\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DumpLoadedImageProtocolInfo (\r
   IN EFI_HANDLE   TheHandle\r
   )\r
 {\r
-  EFI_LOADED_IMAGE_PROTOCOL         *Image;\r
-  EFI_STATUS                        Status;\r
-  CHAR16                            *DevicePathText;\r
-  CHAR16                            *CodeTypeText;\r
-  CHAR16                            *DataTypeText;\r
-  CHAR8                             *PdbPointer;\r
-\r
-  Image = NULL;\r
+  CHAR16 *TheString;\r
 \r
-  Status = gBS->OpenProtocol(TheHandle, &gEfiLoadedImageProtocolGuid, (VOID**)&Image, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
-  if (EFI_ERROR(Status)) {\r
-    return (EFI_INVALID_PARAMETER);\r
-  }\r
-  DevicePathText = ConvertDevicePathToText(Image->FilePath, TRUE, TRUE);\r
-  CodeTypeText   = ConvertMemoryType(Image->ImageCodeType);\r
-  DataTypeText   = ConvertMemoryType(Image->ImageDataType);\r
-  PdbPointer     = (CHAR8*)PeCoffLoaderGetPdbPointer(Image->ImageBase);\r
-  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_UNLOAD_VERBOSE), gShellDriver1HiiHandle,\r
-    ConvertHandleToHandleIndex(TheHandle),\r
-    TheHandle,\r
-    Image,\r
-    Image->ParentHandle,\r
-    Image->SystemTable,\r
-    Image->DeviceHandle,\r
-    DevicePathText,\r
-    PdbPointer,\r
-    Image->ImageBase,\r
-    Image->ImageSize,\r
-    CodeTypeText,\r
-    DataTypeText\r
-    );\r
-\r
-  SHELL_FREE_NON_NULL(DevicePathText);\r
-  SHELL_FREE_NON_NULL(CodeTypeText);\r
-  SHELL_FREE_NON_NULL(DataTypeText);\r
+  TheString = GetProtocolInformationDump(TheHandle, &gEfiLoadedImageProtocolGuid, TRUE);\r
+  \r
+  ShellPrintEx(-1, -1, L"%s", TheString);\r
 \r
+  SHELL_FREE_NON_NULL(TheString);\r
+  \r
   return (EFI_SUCCESS);\r
 }\r
 \r
@@ -114,7 +86,7 @@ ShellCommandRunUnload (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle,L"unload", ProblemParam);  \r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -125,10 +97,10 @@ ShellCommandRunUnload (
       //\r
       // error for too many parameters\r
       //\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"unload");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetCount(Package) < 2) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"unload");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       Param1    = ShellCommandLineGetRawValue(Package, 1);\r
@@ -138,7 +110,7 @@ ShellCommandRunUnload (
       }\r
 \r
       if (EFI_ERROR(Status) || Param1 == NULL || TheHandle == NULL){\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"unload", Param1);  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else {\r
         ASSERT(TheHandle != NULL);\r