From: Peter Tyser <ptyser@xes-inc.com>
Date: Sun, 25 Oct 2009 20:12:52 +0000 (-0500)
Subject: Check for NULL prompt in readline_into_buffer()
X-Git-Tag: v2009.11-rc1~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e491a71e578e93bd3b2f8f20d8ef8f111c98010d;p=u-boot

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>
---

diff --git a/common/main.c b/common/main.c
index 026edd1db2..298982a48a 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;