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 271271120b0f1919db6ac92569653303250c9869..cc1099f68f0e055ef22e0f421c3fdd259f9c0345 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -2,7 +2,7 @@
   Main file for DrvDiag shell Driver1 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<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
@@ -42,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
@@ -94,7 +93,9 @@ 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
@@ -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
@@ -374,7 +382,7 @@ ShellCommandRunDrvDiag (
             || (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