* [PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL
@ 2016-08-16 7:32 Ruiyu Ni
2016-08-16 7:37 ` Wu, Hao A
0 siblings, 1 reply; 2+ messages in thread
From: Ruiyu Ni @ 2016-08-16 7:32 UTC (permalink / raw)
To: edk2-devel; +Cc: Hao Wu
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
---
ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 +++++
1 file changed, 5 insertions(+)
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)));
}
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL
2016-08-16 7:32 [PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL Ruiyu Ni
@ 2016-08-16 7:37 ` Wu, Hao A
0 siblings, 0 replies; 2+ messages in thread
From: Wu, Hao A @ 2016-08-16 7:37 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu
> Ni
> Sent: Tuesday, August 16, 2016 3:33 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A
> Subject: [edk2] [PATCH] 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>
> Cc: Hao Wu <hao.a.wu@intel.com>
> ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> 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)));
> }
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-16 7:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-16 7:32 [PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL Ruiyu Ni
2016-08-16 7:37 ` Wu, Hao A
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox