diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-06-21 16:51:49 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-06-21 16:51:49 +0100 |
| commit | 7f31e5d6698b061ac49a049053632c7cccb546f2 (patch) | |
| tree | 20dbd5b8404dbefe90db8ee2ccbd5757ba09b920 | |
| parent | 162fed6be629c847e162462331565e9204e47fa2 (diff) | |
| parent | 69447bc8c15bebd50bbd657e760dd439ac028967 (diff) | |
Merge branch 'linaro-topic-bds' into linaro-tracking-2013.06linaro-uefi-2013.06-rc6
| -rw-r--r-- | ArmPlatformPkg/Bds/BdsHelper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ArmPlatformPkg/Bds/BdsHelper.c b/ArmPlatformPkg/Bds/BdsHelper.c index d1889f4396..d295311454 100644 --- a/ArmPlatformPkg/Bds/BdsHelper.c +++ b/ArmPlatformPkg/Bds/BdsHelper.c @@ -35,7 +35,7 @@ EditHIInputStr ( CmdLine[MaxCmdLine - 1] = '\0';
// To prevent a buffer overflow, we only allow to enter (MaxCmdLine-1) characters
- for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine-1; ) {
+ for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) {
Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &WaitIndex);
ASSERT_EFI_ERROR (Status);
@@ -62,7 +62,7 @@ EditHIInputStr ( }
} else if ((Key.ScanCode == SCAN_ESC) || (Char == 0x1B) || (Char == 0x0)) {
return EFI_INVALID_PARAMETER;
- } else {
+ } else if (CmdLineIndex < (MaxCmdLine-1)) {
CmdLine[CmdLineIndex++] = Key.UnicodeChar;
Print (L"%c", Key.UnicodeChar);
}
|