summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-10-25 15:12:52 -0500
committerWolfgang Denk <wd@denx.de>2009-10-27 20:58:25 +0100
commite491a71e578e93bd3b2f8f20d8ef8f111c98010d (patch)
treee4c068044178bf286f8d5c9fd4e216b5be53f22c
parent16d1c10783660f3fdbc3c19141f42f3b0d1834d3 (diff)
downloadu-boot-imx-e491a71e578e93bd3b2f8f20d8ef8f111c98010d.zip
u-boot-imx-e491a71e578e93bd3b2f8f20d8ef8f111c98010d.tar.gz
u-boot-imx-e491a71e578e93bd3b2f8f20d8ef8f111c98010d.tar.bz2
Check for NULL prompt in readline_into_buffer()
Previously, passing readline() or readline_into_buffer() a NULL 'prompt' parameter would result in puts() printing garbage when CONFIG_CMDLINE_EDITING was enabled. Note that no board currently triggers this bug. Enabling CONFIG_CMDLINE_EDITING on some boards (eg bab7xx) would result in the bug appearing. This change is only intended to prevent someone from running into this issue in the future. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
-rw-r--r--common/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/main.c b/common/main.c
index 026edd1..298982a 100644
--- a/common/main.c
+++ b/common/main.c
@@ -964,7 +964,8 @@ int readline_into_buffer (const char *const prompt, char * buffer)
initted = 1;
}
- puts (prompt);
+ if (prompt)
+ puts (prompt);
rc = cread_line(prompt, p, &len);
return rc < 0 ? rc : len;