[PATCH] ShellPkg: Fix a bug ">>v" cannot append data to environment variable

[PATCH] ShellPkg: Fix a bug ">>v" cannot append data to environment variable

[Ruiyu Ni]

From: chen881220 <ai_terran@foxmail.com>

When ">v" is used to redirect the command output to environment
variable, the ending "\r\n\0" is removed before setting to environment
variable but the length is not updated.
It causes ">>v" fails to append data to the environment variable
created by ">v".
The patch fixes the above bug.

Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
---
 ShellPkg/Application/Shell/FileHandleWrappers.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/Application/Shell/FileHandleWrappers.c
index 3c11d82..67ca8e7 100644
--- a/ShellPkg/Application/Shell/FileHandleWrappers.c
+++ b/ShellPkg/Application/Shell/FileHandleWrappers.c
@@ -1074,6 +1074,10 @@ FileInterfaceEnvClose(
            (((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] == CHAR_CARRIAGE_RETURN)
          ) {
         ((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] = CHAR_NULL;
+        //
+        // If the NewBuffer end with \r\n\0, We will repace '\r' by '\0' and then update TotalSize.
+        //
+        TotalSize -= sizeof(CHAR16) * 2;
       }
 
       if (Volatile) {
-- 
2.9.0.windows.1

Re: [PATCH] ShellPkg: Fix a bug ">>v" cannot append data to environment variable

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Please verify appropriate copyright before commit (I guess this file needs year update).

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Tuesday, January 03, 2017 7:23 PM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Chen, Chen A
> <chen.a.chen@intel.com>; chen881220 <ai_terran@foxmail.com>
> Subject: [edk2] [PATCH] ShellPkg: Fix a bug ">>v" cannot append data to
> environment variable
> Importance: High
> 
> From: chen881220 <ai_terran@foxmail.com>
> 
> When ">v" is used to redirect the command output to environment
> variable, the ending "\r\n\0" is removed before setting to environment
> variable but the length is not updated.
> It causes ">>v" fails to append data to the environment variable
> created by ">v".
> The patch fixes the above bug.
> 
> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
>  ShellPkg/Application/Shell/FileHandleWrappers.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c
> b/ShellPkg/Application/Shell/FileHandleWrappers.c
> index 3c11d82..67ca8e7 100644
> --- a/ShellPkg/Application/Shell/FileHandleWrappers.c
> +++ b/ShellPkg/Application/Shell/FileHandleWrappers.c
> @@ -1074,6 +1074,10 @@ FileInterfaceEnvClose(
>             (((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] ==
> CHAR_CARRIAGE_RETURN)
>           ) {
>          ((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] = CHAR_NULL;
> +        //
> +        // If the NewBuffer end with \r\n\0, We will repace '\r' by '\0' and then
> update TotalSize.
> +        //
> +        TotalSize -= sizeof(CHAR16) * 2;
>        }
> 
>        if (Volatile) {
> --
> 2.9.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel