commit 56147434f3c38c50cb95b20141ff4b75b1be2a5b
parent 21cb01e5437c7fdd45f02ae21887248943bcdb08
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 22 Aug 2016 11:20:47 +0200
prompt: don't crash when the terminal is less than four columns wide
This fixes https://savannah.gnu.org/bugs/?48792.
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/prompt.c b/src/prompt.c
@@ -724,14 +724,14 @@ int do_prompt(bool allow_tabs,
size_t was_statusbar_x = statusbar_x;
size_t was_pww = statusbar_pww;
- prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1);
+ prompt = charalloc((COLS * mb_cur_max()) + 1);
bottombars(menu);
va_start(ap, msg);
- vsnprintf(prompt, (COLS - 4) * mb_cur_max(), msg, ap);
+ vsnprintf(prompt, COLS * mb_cur_max(), msg, ap);
va_end(ap);
- null_at(&prompt, actual_x(prompt, COLS - 4));
+ null_at(&prompt, actual_x(prompt, (COLS < 4) ? 0 : COLS - 4));
func = get_prompt_string(&retval, allow_tabs,
#ifndef DISABLE_TABCOMP