summaryrefslogtreecommitdiff
path: root/ShellPkg
diff options
context:
space:
mode:
authorRuiyu Ni <ruiyu.ni@intel.com>2016-08-16 15:32:18 +0800
committerRuiyu Ni <ruiyu.ni@intel.com>2016-08-17 13:44:51 +0800
commit795c78cf190ba7ac3e7edd76e6c31b8505c2d739 (patch)
tree09e6026c702a7b345c0f2834fe6ddda07b3cfaf3 /ShellPkg
parentfd4d9c6495109979eb17779e07666c7c11c79c6a (diff)
downloadedk2-795c78cf190ba7ac3e7edd76e6c31b8505c2d739.zip
edk2-795c78cf190ba7ac3e7edd76e6c31b8505c2d739.tar.gz
edk2-795c78cf190ba7ac3e7edd76e6c31b8505c2d739.tar.bz2
ShellPkg/Ls: Handle the case when SearchString is NULL
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 0b80195..9b4c452 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -709,6 +709,11 @@ ShellCommandRunLs (
// must split off the search part that applies to files from the end of the directory part
//
StrnCatGrow(&SearchString, NULL, FullPath, 0);
+ if (SearchString == NULL) {
+ FreePool (FullPath);
+ ShellCommandLineFreeVarList (Package);
+ return SHELL_OUT_OF_RESOURCES;
+ }
PathRemoveLastItem (FullPath);
CopyMem (SearchString, SearchString + StrLen (FullPath), StrSize (SearchString + StrLen (FullPath)));
}