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

MdeModulePkg/BootMaintUi: Add error handling codes when AllocatePool fail

Browse Source 
The AllocateCopyPool in function ExtractFileNameFromDevicePath
may return NULL, so need to do error handling. This patch is to
add error handling codes for function ExtractFileNameFromDevicePath
and its caller functions.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Bi, Dandan
2016-07-05 16:53:11 +08:00
committed by Hao Wu
parent ae9026ddfa
commit a91f1a0e88
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
View File

@@ -865,29 +865,33 @@ BootFromFile (
EFI_BOOT_MANAGER_LOAD_OPTION BootOption;
CHAR16 *FileName;
FileName = NULL;
FileName = ExtractFileNameFromDevicePath(FilePath);
EfiBootManagerInitializeLoadOption (
&BootOption,
0,
LoadOptionTypeBoot,
LOAD_OPTION_ACTIVE,
FileName,
FilePath,
NULL,
0
);
//
// Since current no boot from removable media directly is allowed */
//
gST->ConOut->ClearScreen (gST->ConOut);
if (FileName != NULL) {
EfiBootManagerInitializeLoadOption (
&BootOption,
0,
LoadOptionTypeBoot,
LOAD_OPTION_ACTIVE,
FileName,
FilePath,
NULL,
0
);
//
// Since current no boot from removable media directly is allowed */
//
gST->ConOut->ClearScreen (gST->ConOut);
BmmSetConsoleMode (FALSE);
EfiBootManagerBoot (&BootOption);
BmmSetConsoleMode (TRUE);
BmmSetConsoleMode (FALSE);
EfiBootManagerBoot (&BootOption);
BmmSetConsoleMode (TRUE);
FreePool(FileName);
FreePool(FileName);
EfiBootManagerFreeLoadOption (&BootOption);
EfiBootManagerFreeLoadOption (&BootOption);
}
return FALSE;
}