From 3663fbc0b7fbb4fc77760fa78b6104050989d995 Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Wed, 13 Jul 2016 15:44:43 +0800
Subject: ShellPkg/DrvDiag: Handle memory allocation failure

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
(cherry picked from commit 26ca45a86fa519e61c511ed27718b3f6dfe2710c)
---
 ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index 973a99505e..1173f8d7be 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -2,7 +2,7 @@
   Main file for DrvDiag shell Driver1 function.
 
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -94,7 +94,9 @@ DoDiagnostics (
 
   if (DriverHandle != NULL) {
     DriverHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
-    ASSERT(DriverHandleList!=NULL);
+    if (DriverHandleList == NULL) {
+      return EFI_OUT_OF_RESOURCES;
+    }
     DriverHandleList[0] = DriverHandle;
     DriverHandleListCount = 1;
   } else {
@@ -109,7 +111,10 @@ DoDiagnostics (
 
   if (ControllerHandle != NULL) {
     ControllerHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
-    ASSERT(ControllerHandleList!=NULL);
+    if (ControllerHandleList == NULL) {
+      SHELL_FREE_NON_NULL (DriverHandleList);
+      return EFI_OUT_OF_RESOURCES;
+    }
     ControllerHandleList[0] = ControllerHandle;
     ControllerHandleListCount = 1;
   } else {
@@ -118,7 +123,11 @@ DoDiagnostics (
 
   if (ChildHandle != NULL) {
     ChildHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
-    ASSERT(ChildHandleList!=NULL);
+    if (ChildHandleList != NULL) {
+      SHELL_FREE_NON_NULL (ControllerHandleList);
+      SHELL_FREE_NON_NULL (DriverHandleList);
+      return EFI_OUT_OF_RESOURCES;
+    }
     ChildHandleList[0] = ChildHandle;
     ChildHandleListCount = 1;
   } else if (AllChilds) {
-- 
cgit v1.2.3