summaryrefslogtreecommitdiff
path: root/edk2/ShellPkg/Application
diff options
context:
space:
mode:
authorjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>2011-04-01 16:11:59 +0000
committerjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>2011-04-01 16:11:59 +0000
commitc607901b39d28942c83cbe279cc61c3e47b0e252 (patch)
treea128c13e49ad86c230168c50105b6303995c5903 /edk2/ShellPkg/Application
parentfa6bd1fe7bdc3f157d24991ee6c0e58656d61911 (diff)
fix initialization of pointer.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk@11498 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'edk2/ShellPkg/Application')
-rw-r--r--edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c b/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 5fce9e544..76935333d 100644
--- a/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -528,7 +528,7 @@ UpdateStdInStdOutStdErr(
ErrAppend = FALSE;
OutAppend = FALSE;
CommandLineCopy = NULL;
- FirstLocation = (CHAR16*)(-1);
+ FirstLocation = NULL;
if (ShellParameters == NULL || SystemTableInfo == NULL || OldStdIn == NULL || OldStdOut == NULL || OldStdErr == NULL) {
return (EFI_INVALID_PARAMETER);
@@ -551,6 +551,7 @@ UpdateStdInStdOutStdErr(
CommandLineCopy = StrnCatGrow(&CommandLineCopy, NULL, NewCommandLine, 0);
Status = EFI_SUCCESS;
Split = NULL;
+ FirstLocation = CommandLineCopy + StrLen(CommandLineCopy);
StripQuotes(CommandLineCopy);
@@ -810,7 +811,7 @@ UpdateStdInStdOutStdErr(
}
}
- if (FirstLocation != (CHAR16*)(-1)
+ if (FirstLocation != CommandLineCopy + StrLen(CommandLineCopy)
&& ((UINTN)(FirstLocation - CommandLineCopy) < StrLen(NewCommandLine))
){
*(NewCommandLine + (UINTN)(FirstLocation - CommandLineCopy)) = CHAR_NULL;