From 233f8184ecfa5df4a666a64792a97db0ecdc9d66 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 7 Mar 2008 13:13:17 +0000 Subject: [PATCH] Reserve two bytes at the end of the DDB input line in db_readline() to hold the newline and nul terminator. Otherwise, there are cases where garbage may end up in the command history due to a lack of a nul terminator, or input may end up without room for a newline. MFC after: 3 days PR: 119079 Submitted by: Michael Plass --- sys/ddb/db_input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index b71324ec79e..39f2da7bd90 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -302,6 +302,9 @@ db_readline(lstart, lsize) char * lstart; int lsize; { + + if (lsize < 2) + return (0); if (lsize != db_lhistlsize) { /* * (Re)initialize input line history. Throw away any @@ -316,7 +319,7 @@ db_readline(lstart, lsize) db_force_whitespace(); /* synch output position */ db_lbuf_start = lstart; - db_lbuf_end = lstart + lsize; + db_lbuf_end = lstart + lsize - 2; /* Will append NL and NUL. */ db_lc = lstart; db_le = lstart;