From 0158294b9b91d349d6842012cf00c9e03213c6f2 Mon Sep 17 00:00:00 2001 From: jcarsey Date: Fri, 10 Jul 2009 19:46:17 +0000 Subject: fixed operator order git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8887 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Library/UefiShellLib/UefiShellLib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ShellPkg') diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c index 54b6a43e03..66fcc9f89d 100644 --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c @@ -2005,6 +2005,7 @@ CopyReplace( IN CONST CHAR16 *FindTarget, IN CONST CHAR16 *ReplaceWith ){ + UINTN Size; if ( (SourceString == NULL) || (NewString == NULL) || (FindTarget == NULL) @@ -2018,12 +2019,14 @@ CopyReplace( while (*SourceString != L'\0') { if (StrnCmp(SourceString, FindTarget, StrLen(FindTarget)) == 0) { SourceString += StrLen(FindTarget); - if ((StrSize(NewString) + (StrLen(ReplaceWith)*sizeof(CHAR16))) > NewSize) { + Size = StrSize(NewString); + if ((Size + (StrLen(ReplaceWith)*sizeof(CHAR16))) > NewSize) { return (EFI_BUFFER_TOO_SMALL); } StrCat(NewString, ReplaceWith); } else { - if (StrSize(NewString) + sizeof(CHAR16) > NewSize) { + Size = StrSize(NewString); + if (Size + sizeof(CHAR16) > NewSize) { return (EFI_BUFFER_TOO_SMALL); } StrnCat(NewString, SourceString, 1); -- cgit v1.2.3