From 55b1d63de7677f89178f200404d8d05a23150a4a Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Wed, 13 Jul 2016 15:43:55 +0800 Subject: [PATCH] ShellPkg/DevTree: Handle memory allocation failure Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Reviewed-by: Jaben Carsey --- .../Library/UefiShellDriver1CommandsLib/DevTree.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c index fb9de10a54..237cb85f94 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c @@ -2,7 +2,7 @@ Main file for DevTree shell Driver1 function. (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
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 @@ -57,7 +57,8 @@ DoDevTreeForHandle( ChildHandleBuffer = NULL; ChildCount = 0; - ASSERT(TheHandle != NULL); + ASSERT (TheHandle != NULL); + ASSERT (HiiString != NULL); if (ShellGetExecutionBreakFlag()) { ShellStatus = SHELL_ABORTED; @@ -91,10 +92,10 @@ DoDevTreeForHandle( return SHELL_SUCCESS; } - FormatString = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0])); - - ASSERT(HiiString != NULL); - ASSERT(FormatString != NULL); + FormatString = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0])); + if (FormatString == NULL) { + return SHELL_OUT_OF_RESOURCES; + } // // we generate the format string on the fly so that we can control the -- 2.39.2