diff options
| author | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-07-10 19:46:17 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-07-10 19:46:17 +0000 |
| commit | feeed28bfa53f4bec4156b366a050f301f45de5d (patch) | |
| tree | ac13e1a71801594c7369beb928deb961e0f95984 /edk2/ShellPkg/Library/UefiShellLib | |
| parent | 4972d835816bd8e201e4e213d2e9e99aef5c08f5 (diff) | |
fixed operator order
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk@8887 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'edk2/ShellPkg/Library/UefiShellLib')
| -rw-r--r-- | edk2/ShellPkg/Library/UefiShellLib/UefiShellLib.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/edk2/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/edk2/ShellPkg/Library/UefiShellLib/UefiShellLib.c index 54b6a43e0..66fcc9f89 100644 --- a/edk2/ShellPkg/Library/UefiShellLib/UefiShellLib.c +++ b/edk2/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);
|