Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bim] Fix deleting lines at end of buffer causing crash / misaligned pointer

Browse Source
This commit is contained in:
K. Lange 2018-08-20 13:34:00 +09:00
parent 7d9978799d
commit dc793bff77
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/bim.c
View File

@ -1828,6 +1828,16 @@ void redraw_line(int j, int x) {
clear_to_end();
}
/**
* Draw a ~ line where there is no buffer text.
*/
void draw_excess_line(int j) {
place_cursor(1,2 + j);
set_colors(COLOR_ALT_FG, COLOR_ALT_BG);
printf("~");
clear_to_end();
}
/**
* Redraw the entire text area
*/
@ -1847,10 +1857,7 @@ void redraw_text(void) {
/* Draw the rest of the text region as ~ lines */
for (; j < l; ++j) {
place_cursor(1,2 + j);
set_colors(COLOR_ALT_FG, COLOR_ALT_BG);
printf("~");
clear_to_end();
draw_excess_line(j);
}
}
@ -2556,10 +2563,7 @@ void cursor_down(void) {
if (env->offset + l < env->line_count + 1) {
redraw_line(l-1, env->offset + l-1);
} else {
place_cursor(1, 2 + l - 1);
set_colors(COLOR_ALT_FG, COLOR_ALT_BG);
printf("~");
clear_to_end();
draw_excess_line(l - 1);
}
/* Redraw elements that were moved by scrolling */
@ -3728,6 +3732,12 @@ void line_selection_mode(void) {
void _redraw_line(int line, int force_start_line) {
if (!force_start_line && line == start_line) return;
if (line > env->line_count + 1) {
if (line - env->offset - 1 < global_config.term_height - global_config.bottom_size - 1) {
draw_excess_line(line - env->offset - 1);
}
return;
}
if ((env->line_no < start_line && line < env->line_no) ||
(env->line_no > start_line && line > env->line_no) ||
@ -3863,6 +3873,9 @@ void line_selection_mode(void) {
remove_line(env->lines, env->line_no-1);
}
}
if (env->line_no > env->line_count) {
env->line_no = env->line_count;
}
set_modified();
goto _leave_select_line;
case ' ':