Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam 2022-03-30 10:01:11 +01:00
commit fc82f2525c

2
grid.c
View File

@ -1003,7 +1003,7 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
gl = grid_peek_line(gd, py);
for (xx = px; xx < px + nx; xx++) {
if (gl == NULL || xx >= gl->cellsize)
if (gl == NULL || xx >= gl->cellused)
break;
grid_get_cell(gd, xx, py, &gc);
if (gc.flags & GRID_FLAG_PADDING)