Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct an out-of-bounds index in screen

Browse source 
Fixes #6037
This commit is contained in:
ridiculousfish 2019-08-10 14:32:55 -07:00
parent ab6fd6554f
commit 30fd526fc1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/screen.cpp
View file

@ -36,6 +36,7 @@
#include "common.h" #include "common.h"
#include "env.h" #include "env.h"
#include "fallback.h" // IWYU pragma: keep #include "fallback.h" // IWYU pragma: keep
#include "flog.h"
#include "highlight.h" #include "highlight.h"
#include "output.h" #include "output.h"
#include "pager.h" #include "pager.h"
@ -387,7 +388,8 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
if (b == L'\n') { if (b == L'\n') {
// Current line is definitely hard wrapped. // Current line is definitely hard wrapped.
s->desired.create_line(s->desired.line_count()); // Create the next line.
s->desired.create_line(s->desired.cursor.y + 1);
s->desired.line(s->desired.cursor.y).is_soft_wrapped = false; s->desired.line(s->desired.cursor.y).is_soft_wrapped = false;
int line_no = ++s->desired.cursor.y; int line_no = ++s->desired.cursor.y;
s->desired.cursor.x = 0; s->desired.cursor.x = 0;
@ -411,7 +413,6 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
if ((s->desired.cursor.x + cw) > screen_width) { if ((s->desired.cursor.x + cw) > screen_width) {
// Current line is soft wrapped (assuming we support it). // Current line is soft wrapped (assuming we support it).
s->desired.line(s->desired.cursor.y).is_soft_wrapped = true; s->desired.line(s->desired.cursor.y).is_soft_wrapped = true;
// std::fwprintf(stderr, L"\n\n1 Soft wrapping %d\n\n", s->desired.cursor.y);
line_no = (int)s->desired.line_count(); line_no = (int)s->desired.line_count();
s->desired.add_line(); s->desired.add_line();