ShellPkg/for: Fix potential null pointer deference

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index 986dc3a05625054490cd8c0a65d6fe620f0dda8e..cc1099f68f0e055ef22e0f421c3fdd259f9c0345 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -1,7 +1,8 @@
 /** @file\r
   Main file for DrvDiag shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2016, 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
@@ -41,7 +42,6 @@ typedef enum {
   @retval EFI_NOT_FOUND         No diagnostic handle could be found.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoDiagnostics (\r
   IN CONST DRV_DIAG_TEST_MODE Mode,\r
   IN CONST CHAR8              *Lang,\r
@@ -71,7 +71,6 @@ DoDiagnostics (
   UINTN                               HandleIndex1;\r
   UINTN                               HandleIndex2;\r
   CHAR8                               *Language;\r
-  CHAR8                               *TempChar;\r
   BOOLEAN                             Found;\r
 \r
   if ((ChildHandle != NULL && AllChilds) || (Mode >= TestModeMax)){\r
@@ -94,14 +93,16 @@ DoDiagnostics (
 \r
   if (DriverHandle != NULL) {\r
     DriverHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));\r
-    ASSERT(DriverHandleList!=NULL);\r
+    if (DriverHandleList == NULL) {\r
+      return EFI_OUT_OF_RESOURCES;\r
+    }\r
     DriverHandleList[0] = DriverHandle;\r
     DriverHandleListCount = 1;\r
   } else {\r
     DriverHandleList = GetHandleListByProtocolList(DiagGuidList);\r
     if (DriverHandleList == NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);  \r
       return (EFI_NOT_FOUND);\r
     } \r
     for (Walker = DriverHandleList ; Walker != NULL && *Walker != NULL ; DriverHandleListCount++, Walker++);\r
@@ -109,7 +110,10 @@ DoDiagnostics (
 \r
   if (ControllerHandle != NULL) {\r
     ControllerHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));\r
-    ASSERT(ControllerHandleList!=NULL);\r
+    if (ControllerHandleList == NULL) {\r
+      SHELL_FREE_NON_NULL (DriverHandleList);\r
+      return EFI_OUT_OF_RESOURCES;\r
+    }\r
     ControllerHandleList[0] = ControllerHandle;\r
     ControllerHandleListCount = 1;\r
   } else {\r
@@ -118,7 +122,11 @@ DoDiagnostics (
 \r
   if (ChildHandle != NULL) {\r
     ChildHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));\r
-    ASSERT(ChildHandleList!=NULL);\r
+    if (ChildHandleList == NULL) {\r
+      SHELL_FREE_NON_NULL (ControllerHandleList);\r
+      SHELL_FREE_NON_NULL (DriverHandleList);\r
+      return EFI_OUT_OF_RESOURCES;\r
+    }\r
     ChildHandleList[0] = ChildHandle;\r
     ChildHandleListCount = 1;\r
   } else if (AllChilds) {\r
@@ -180,24 +188,8 @@ DoDiagnostics (
                 gImageHandle,\r
                 NULL,\r
                 EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
-              if (!EFI_ERROR(Status)) {\r
-                if (Lang == NULL) {\r
-                  Language = AllocateZeroPool(AsciiStrSize(DriverDiagnostics2->SupportedLanguages));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, DriverDiagnostics2->SupportedLanguages);\r
-                  TempChar = AsciiStrStr(Language, ";");\r
-                  if (TempChar != NULL){\r
-                    *TempChar = CHAR_NULL;\r
-                  }\r
-                } else {\r
-                  Language = AllocateZeroPool(AsciiStrSize(Lang));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, Lang);\r
-                }\r
+              if (!EFI_ERROR(Status) && (DriverDiagnostics2 != NULL)) {\r
+                Language = GetBestLanguageForDriver(DriverDiagnostics2->SupportedLanguages, Lang, FALSE);\r
                 Found = TRUE;\r
                 Status = DriverDiagnostics2->RunDiagnostics(\r
                   DriverDiagnostics2,\r
@@ -220,23 +212,7 @@ DoDiagnostics (
                 NULL,\r
                 EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
               if (!EFI_ERROR(Status)) {\r
-                if (Lang == NULL) {\r
-                  Language = AllocateZeroPool(AsciiStrSize(DriverDiagnostics2->SupportedLanguages));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, DriverDiagnostics2->SupportedLanguages);\r
-                  TempChar = AsciiStrStr(Language, ";");\r
-                  if (TempChar != NULL){\r
-                    *TempChar = CHAR_NULL;\r
-                  }\r
-                } else {\r
-                  Language = AllocateZeroPool(AsciiStrSize(Lang));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, Lang);\r
-                }\r
+                Language = GetBestLanguageForDriver(DriverDiagnostics->SupportedLanguages, Lang, FALSE);\r
                 Status = DriverDiagnostics->RunDiagnostics(\r
                   DriverDiagnostics,\r
                   ControllerHandleList[ControllerHandleListLoop],\r
@@ -381,7 +357,7 @@ ShellCommandRunDrvDiag (
   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"drvdiag", ProblemParam);  \r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -399,14 +375,14 @@ ShellCommandRunDrvDiag (
       //\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"drvdiag");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if ((ShellCommandLineGetFlag(Package, L"-s"))\r
             || (ShellCommandLineGetFlag(Package, L"-e"))\r
             || (ShellCommandLineGetFlag(Package, L"-m"))\r
            ){\r
       //\r
-      // Run the apropriate test\r
+      // Run the appropriate test\r
       //\r
       if        (ShellCommandLineGetFlag(Package, L"-s")) {\r
         Mode =   TestModeStandard;\r
@@ -427,7 +403,7 @@ ShellCommandRunDrvDiag (
     Lang = ShellCommandLineGetValue(Package, L"-l");\r
     if (ShellCommandLineGetFlag(Package, L"-l") && Lang == NULL) {\r
       ASSERT(Language == NULL);\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvdiag",  L"-l");  \r
       ShellCommandLineFreeVarList (Package);\r
       return (SHELL_INVALID_PARAMETER);\r
     } else if (Lang != NULL) {\r