[PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL

[PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL

[Ruiyu Ni]

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

Re: [PATCH] ShellPkg/Ls: Handle the case when SearchString is NULL

[Wu, Hao A]

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