Reviewed-by: Jaben Carsey <[email protected]>

> -----Original Message-----
> From: Qiu, Shumin
> Sent: Monday, January 4, 2016 8:03 PM
> To: [email protected]
> Cc: Qiu, Shumin <[email protected]>; Carsey, Jaben
> <[email protected]>
> Subject: [PATCH] ShellPkg: Fix Shell assert when mv a file to a NULL target.
> Importance: High
> 
> When run command 'mv file ' the Shell assert. The patch refined the length of
> the buffer to fix this bug.
> 
> Cc: Jaben Carsey <[email protected]>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Qiu Shumin <[email protected]>
> ---
>  ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> index eb7287e..29efb1c 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> @@ -2,7 +2,7 @@
>    Main file for mv shell level 2 function.
> 
>    (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
> -  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2009 - 2016, Intel Corporation. All rights
> + reserved.<BR>
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of the BSD
> License
>    which accompanies this distribution.  The full text of the license may be 
> found
> at @@ -731,7 +731,7 @@ ShellCommandRunMv (
>              //
>              // ValidateAndMoveFiles will report errors to the screen itself
>              //
> -            CwdSize = StrSize(ShellGetCurrentDir(NULL)) + 1;
> +            CwdSize = StrSize(ShellGetCurrentDir(NULL)) +
> + sizeof(CHAR16);
>              Cwd = AllocateZeroPool(CwdSize);
>              ASSERT (Cwd != NULL);
>              StrCpyS(Cwd, CwdSize/sizeof(CHAR16), ShellGetCurrentDir(NULL));
> --
> 1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to