diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-06-21 17:57:56 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-06-21 17:57:56 +0100 |
| commit | fe29a8a877edb5f8495c1da34f98c023e0e9be45 (patch) | |
| tree | 20dbd5b8404dbefe90db8ee2ccbd5757ba09b920 | |
| parent | a70b8ca03acd78bb116fe4c9f89f8d5c2205f179 (diff) | |
| parent | 87ef8d464de14da8b7f50bcdb82af3b47ed56488 (diff) | |
Merging uefi-next/linaro-release into masterlinaro-uefi-2013.06-01
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -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 d1889f439..d29531145 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);
}
|