From: Jacek Caban Subject: [PATCH] conhost: Fix wripping search in edit_line_find_in_history. Message-Id: <6ff5e3c8-b2aa-b1fe-1c17-c29c1abd3a82@codeweavers.com> Date: Mon, 4 Jan 2021 21:13:50 +0100 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000 Signed-off-by: Jacek Caban --- programs/conhost/conhost.c | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3e41577a44b..0ac1c5f507b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -691,6 +691,7 @@ static void edit_line_find_in_history( struct console *console ) unsigned int len, oldoffset; WCHAR *line; + if (!console->history_index) return; if (ctx->history_index && ctx->history_index == console->history_index) { start_pos--; @@ -699,28 +700,28 @@ static void edit_line_find_in_history( struct console *console ) do { - line = edit_line_history(console, ctx->history_index); - - if (ctx->history_index) ctx->history_index--; - else ctx->history_index = console->history_index; - - len = lstrlenW(line) + 1; - if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) - { - /* need to clean also the screen if new string is shorter than old one */ - edit_line_delete(console, 0, ctx->len); - - if (edit_line_grow(console, len)) - { - oldoffset = ctx->cursor; - ctx->cursor = 0; - edit_line_insert( console, line, len - 1 ); - ctx->cursor = oldoffset; - free(line); - return; - } - } - free(line); + line = edit_line_history(console, ctx->history_index); + + if (ctx->history_index) ctx->history_index--; + else ctx->history_index = console->history_index - 1; + + len = lstrlenW(line) + 1; + if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) + { + /* need to clean also the screen if new string is shorter than old one */ + edit_line_delete(console, 0, ctx->len); + + if (edit_line_grow(console, len)) + { + oldoffset = ctx->cursor; + ctx->cursor = 0; + edit_line_insert( console, line, len - 1 ); + ctx->cursor = oldoffset; + free(line); + return; + } + } + free(line); } while (ctx->history_index != start_pos); }