summaryrefslogtreecommitdiff
path: root/ShellPkg
diff options
context:
space:
mode:
authorRuiyu Ni <ruiyu.ni@intel.com>2016-07-12 18:06:58 +0800
committerRuiyu Ni <ruiyu.ni@intel.com>2016-07-18 10:55:32 +0800
commit20cfed165c47a7ff578e469e4cf00f1a656eccbd (patch)
tree3fc14844aff60c4ca240831ec3ecb0136585bf71 /ShellPkg
parentaba0ca78c6a96433af9dba74e4e56487b0c27d2e (diff)
downloadedk2-20cfed165c47a7ff578e469e4cf00f1a656eccbd.zip
edk2-20cfed165c47a7ff578e469e4cf00f1a656eccbd.tar.gz
edk2-20cfed165c47a7ff578e469e4cf00f1a656eccbd.tar.bz2
ShellPkg/LoadPciRom: 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>
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
index 1b94746..1b284c2 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
@@ -2,7 +2,7 @@
Main file for LoadPciRom shell Debug1 function.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2005 - 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
@@ -147,7 +147,11 @@ ShellCommandRunLoadPciRom (
}
SourceSize = (UINTN) Node->Info->FileSize;
File1Buffer = AllocateZeroPool (SourceSize);
- ASSERT(File1Buffer != NULL);
+ if (File1Buffer == NULL) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellDebug1HiiHandle, L"loadpcirom");
+ ShellStatus = SHELL_OUT_OF_RESOURCES;
+ continue;
+ }
Status = gEfiShellProtocol->ReadFile(Node->Handle, &SourceSize, File1Buffer);
if (EFI_ERROR(Status)) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_READ_FAIL), gShellDebug1HiiHandle, L"loadpcirom", Node->FullName);