Reviewed-by: Tapan Shah <<[email protected]>> -----Original Message----- From: Qiu Shumin [mailto:[email protected]] Sent: Tuesday, June 30, 2015 9:24 PM To: [email protected] Cc: [email protected]; [email protected]; Shah, Tapan Subject: [PATCH] ShellPkg: Refine the code logic of StrnCatGrow.
In order to indicate the catena length use StrnCatS instead of StrCatS to generate Destination string, and update the DestMax of Destination string. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin <[email protected]> --- 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 [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
