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

ShellPkg/CommandLib: avoid NULL derefence and memory leak 

Since TianoCore EDK2 commit d65f2cea36 ("ShellPkg/CommandLib: Locate
proper UnicodeCollation instance") in edk2 the UEFI Shell crashes if EFI
variable PlatformLang is not defined due to dereferencing gUnicodeCollation
gUnicodeCollation (= NULL) in ShellCommandRegisterCommandName().

Furthermore CommandInit() is leaking PlatformLang if
gUnicodeCollation != NULL.

Close the memory leak and use the first UnicodeCollation instance if
PlatfomLang is not defined.

Fixes: d65f2cea36 ("ShellPkg/CommandLib: Locate proper UnicodeCollation
instance")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Heinrich Schuchardt 2019-05-10 11:24:19 +08:00 committed by Liming Gao
parent 17f8c9e97d
commit 8b8e915845
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,12 +74,10 @@ CommandInit(
EFI_STATUS Status; EFI_STATUS Status;
CHAR8 *PlatformLang; CHAR8 *PlatformLang;
GetEfiGlobalVariable2 (EFI_PLATFORM_LANG_VARIABLE_NAME, (VOID**)&PlatformLang, NULL);
if (PlatformLang == NULL) {
return EFI_UNSUPPORTED;
}
if (gUnicodeCollation == NULL) { if (gUnicodeCollation == NULL) {
GetEfiGlobalVariable2 (EFI_PLATFORM_LANG_VARIABLE_NAME, (VOID**)&PlatformLang, NULL);
Status = gBS->LocateHandleBuffer ( Status = gBS->LocateHandleBuffer (
ByProtocol, ByProtocol,
&gEfiUnicodeCollation2ProtocolGuid, &gEfiUnicodeCollation2ProtocolGuid,
@ -107,6 +105,14 @@ CommandInit(
continue; continue;
} }
//
// Without clue provided use the first Unicode Collation2 protocol.
//
if (PlatformLang == NULL) {
gUnicodeCollation = Uc;
break;
}
// //
// Find the best matching matching language from the supported languages // Find the best matching matching language from the supported languages
// of Unicode Collation2 protocol. // of Unicode Collation2 protocol.
@ -126,7 +132,9 @@ CommandInit(
if (Handles != NULL) { if (Handles != NULL) {
FreePool (Handles); FreePool (Handles);
} }
FreePool (PlatformLang); if (PlatformLang != NULL) {
FreePool (PlatformLang);
}
} }
return (gUnicodeCollation == NULL) ? EFI_UNSUPPORTED : EFI_SUCCESS; return (gUnicodeCollation == NULL) ? EFI_UNSUPPORTED : EFI_SUCCESS;