On Wed, Jul 01, 2015 at 10:23:44AM +0800, Qiu Shumin wrote:
> In order to indicate the catena length use StrnCatS instead of StrCatS to
> generate Destination string, and update the DestMax of Destination string.
>
I just found the latest OVMF crashed when loading the shell, and this patch
works for me.
Thanks for the patch.
Tested-by: Gary Lin <g...@suse.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Qiu Shumin <shumin....@intel.com>
> ---
> ShellPkg/Library/UefiShellLib/UefiShellLib.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> index 5b4c6d3..3521515 100644
> --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> @@ -3254,7 +3254,8 @@ StrnCatGrow (
> *CurrentSize = NewSize;
> }
> } else {
> - *Destination = AllocateZeroPool((Count+1)*sizeof(CHAR16));
> + NewSize = (Count+1)*sizeof(CHAR16);
> + *Destination = AllocateZeroPool(NewSize);
> }
>
> //
> @@ -3264,7 +3265,7 @@ StrnCatGrow (
> return (NULL);
> }
>
> - StrCatS(*Destination, Count + 1, Source);
> + StrnCatS(*Destination, NewSize/sizeof(CHAR16), Source, Count);
> return *Destination;
> }
>
> --
> 1.9.5.msysgit.1
>
>
>
> ------------------------------------------------------------------------------
> Don't Limit Your Business. Reach for the Cloud.
> GigeNET's Cloud Solutions provide you with the tools and support that
> you need to offload your IT needs and focus on growing your business.
> Configured For All Businesses. Start Your Cloud Today.
> https://www.gigenetcloud.com/
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/edk2-devel
>
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
