norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tsm: screen: fix out-of-bounds access when drawing sb

Browse Source 
When drawing scroll-back buffer, we cannot guarantee that the lines are as
long as the current screen. Therefore, check that we aren't accessing out
of bounds and draw empty glyphs instead.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-10-01 12:46:09 +02:00
parent 038aac7fd5
commit 79692f655a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tsm_screen.c
View File

@ -1306,10 +1306,13 @@ void tsm_screen_draw(struct tsm_screen *con,
uint64_t time_prep = 0, time_draw = 0, time_rend = 0;
const uint32_t *ch;
size_t len;
struct cell empty;
if (!con || !draw_cb)
return;
cell_init(con, &empty);
cur_x = con->cursor_x;
if (con->cursor_x >= con->size_x)
cur_x = con->size_x - 1;
@ -1353,7 +1356,10 @@ void tsm_screen_draw(struct tsm_screen *con,
}
for (j = 0; j < con->size_x; ++j) {
cell = &line->cells[j];
if (j < line->size)
cell = &line->cells[j];
else
cell = &empty;
memcpy(&attr, &cell->attr, sizeof(attr));
if (k == cur_y + 1 &&