From e7309dce0277a6d869c30ab9b52e997ad7c9a78c Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Mon, 18 Jan 2016 10:49:48 +0100 Subject: [PATCH] main/asterisk.c: ast_el_read_char Make sure buf[res] is not accessed at res=-1 (buffer underrun). Address Sanitizer will complain about this quite loudly. ASTERISK-24801 #close Change-Id: Ifcd7f691310815a31756b76067c56fba299d3ae9 --- main/asterisk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index 901cee1c51..7745d3f21e 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2577,11 +2577,12 @@ static int ast_el_read_char(EditLine *editline, char *cp) console_print(buf, 0); - if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (buf[res-2] == '\n'))) { + if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) { *cp = CC_REFRESH; return(1); - } else + } else { lastpos = 1; + } } } -- 2.47.2