tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg/UefiShellCommandLib.c: 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>
This commit is contained in:
Ruiyu Ni 2016-07-12 17:38:06 +08:00
parent 2c7c3b87bf
commit 107d05a433
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Provides interface to shell internal functions for shell commands. Provides interface to shell internal functions for shell commands.
Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
@ -546,9 +546,14 @@ ShellCommandRegisterCommandName (
// allocate memory for new struct // allocate memory for new struct
// //
Node = AllocateZeroPool(sizeof(SHELL_COMMAND_INTERNAL_LIST_ENTRY)); Node = AllocateZeroPool(sizeof(SHELL_COMMAND_INTERNAL_LIST_ENTRY));
ASSERT(Node != NULL); if (Node == NULL) {
return RETURN_OUT_OF_RESOURCES;
}
Node->CommandString = AllocateCopyPool(StrSize(CommandString), CommandString); Node->CommandString = AllocateCopyPool(StrSize(CommandString), CommandString);
ASSERT(Node->CommandString != NULL); if (Node->CommandString == NULL) {
FreePool (Node);
return RETURN_OUT_OF_RESOURCES;
}
Node->GetManFileName = GetManFileName; Node->GetManFileName = GetManFileName;
Node->CommandHandler = CommandHandler; Node->CommandHandler = CommandHandler;
@ -807,11 +812,20 @@ ShellCommandRegisterAlias (
// allocate memory for new struct // allocate memory for new struct
// //
Node = AllocateZeroPool(sizeof(ALIAS_LIST)); Node = AllocateZeroPool(sizeof(ALIAS_LIST));
ASSERT(Node != NULL); if (Node == NULL) {
return RETURN_OUT_OF_RESOURCES;
}
Node->CommandString = AllocateCopyPool(StrSize(Command), Command); Node->CommandString = AllocateCopyPool(StrSize(Command), Command);
if (Node->CommandString == NULL) {
FreePool (Node);
return RETURN_OUT_OF_RESOURCES;
}
Node->Alias = AllocateCopyPool(StrSize(Alias), Alias); Node->Alias = AllocateCopyPool(StrSize(Alias), Alias);
ASSERT(Node->CommandString != NULL); if (Node->Alias == NULL) {
ASSERT(Node->Alias != NULL); FreePool (Node->CommandString);
FreePool (Node);
return RETURN_OUT_OF_RESOURCES;
}
InsertHeadList (&mAliasList.Link, &Node->Link); InsertHeadList (&mAliasList.Link, &Node->Link);
@ -1303,7 +1317,10 @@ ShellCommandCreateInitialMappingsAndPaths(
// Get all Device Paths // Get all Device Paths
// //
DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count); DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count);
ASSERT(DevicePathList != NULL); if (DevicePathList == NULL) {
SHELL_FREE_NON_NULL (HandleList);
return EFI_OUT_OF_RESOURCES;
}
for (Count = 0 ; HandleList[Count] != NULL ; Count++) { for (Count = 0 ; HandleList[Count] != NULL ; Count++) {
DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]); DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]);
@ -1360,7 +1377,10 @@ ShellCommandCreateInitialMappingsAndPaths(
// Get all Device Paths // Get all Device Paths
// //
DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count); DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count);
ASSERT(DevicePathList != NULL); if (DevicePathList == NULL) {
SHELL_FREE_NON_NULL (HandleList);
return EFI_OUT_OF_RESOURCES;
}
for (Count = 0 ; HandleList[Count] != NULL ; Count++) { for (Count = 0 ; HandleList[Count] != NULL ; Count++) {
DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]); DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]);