sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the use of ASSERT and other fixes to memory allocation failures (like free before return for errors)

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15759 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey 2014-08-05 23:16:39 +00:00 committed by jcarsey
parent c12383d5ea
commit ae315cc269
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1392,7 +1392,9 @@ ShellCommandUpdateMapping (
// 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) {
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]);
@ -1408,7 +1410,7 @@ ShellCommandUpdateMapping (
// //
// Assign new Mappings to remainders // Assign new Mappings to remainders
// //
for (Count = 0 ; HandleList[Count] != NULL && !EFI_ERROR(Status); Count++) { for (Count = 0 ; !EFI_ERROR(Status) && HandleList[Count] != NULL && !EFI_ERROR(Status); Count++) {
// //
// Skip ones that already have // Skip ones that already have
// //
@ -1419,7 +1421,10 @@ ShellCommandUpdateMapping (
// Get default name // Get default name
// //
NewDefaultName = ShellCommandCreateNewMappingName(MappingTypeFileSystem); NewDefaultName = ShellCommandCreateNewMappingName(MappingTypeFileSystem);
ASSERT(NewDefaultName != NULL); if (NewDefaultName == NULL) {
Status = EFI_OUT_OF_RESOURCES;
break;
}
// //
// Call shell protocol SetMap function now... // Call shell protocol SetMap function now...
@ -1496,11 +1501,14 @@ ConvertEfiFileProtocolToShellHandle(
} }
NewNode = AllocateZeroPool(sizeof(BUFFER_LIST)); NewNode = AllocateZeroPool(sizeof(BUFFER_LIST));
if (NewNode == NULL) { if (NewNode == NULL) {
SHELL_FREE_NON_NULL(Buffer);
return (NULL); return (NULL);
} }
Buffer->FileHandle = (EFI_FILE_PROTOCOL*)Handle; Buffer->FileHandle = (EFI_FILE_PROTOCOL*)Handle;
Buffer->Path = StrnCatGrow(&Buffer->Path, NULL, Path, 0); Buffer->Path = StrnCatGrow(&Buffer->Path, NULL, Path, 0);
if (Buffer->Path == NULL) { if (Buffer->Path == NULL) {
SHELL_FREE_NON_NULL(NewNode);
SHELL_FREE_NON_NULL(Buffer);
return (NULL); return (NULL);
} }
NewNode->Buffer = Buffer; NewNode->Buffer = Buffer;
@ -1638,7 +1646,6 @@ FreeBufferList (
; BufferListEntry = (BUFFER_LIST *)GetFirstNode(&List->Link) ; BufferListEntry = (BUFFER_LIST *)GetFirstNode(&List->Link)
){ ){
RemoveEntryList(&BufferListEntry->Link); RemoveEntryList(&BufferListEntry->Link);
ASSERT(BufferListEntry->Buffer != NULL);
if (BufferListEntry->Buffer != NULL) { if (BufferListEntry->Buffer != NULL) {
FreePool(BufferListEntry->Buffer); FreePool(BufferListEntry->Buffer);
} }