Fcalva/gint
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/gint.git synced 2024-12-29 13:03:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bopti: fix a VRAM overflow through the rightmost column

Browse source 
The checks for VRAM access account for image columns intersecting the
longword before the start of a VRAM line, but not the longword after the
start of a VRAM line. This is now fixed.
This commit is contained in:
Lephe 2021-06-08 09:38:09 +02:00
parent fc6fb9dc09
commit edcebff311
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/render-fx/bopti.c
View file

@ -25,6 +25,8 @@ struct command
uint32_t *masks; uint32_t *masks;
/* Whether the first column is real (ie. x>=0) or not */ /* Whether the first column is real (ie. x>=0) or not */
int real_start; int real_start;
/* Whether the last column is written to VRAM */
int real_end;
/* Ignored elements between two rendered grid rows */ /* Ignored elements between two rendered grid rows */
int vram_stride; int vram_stride;
@ -103,7 +105,7 @@ void bopti_grid(void **layer, int rows, struct command *c)
offset++; offset++;
} }
if(c->x) v1[offset] = pret.r; if(c->real_end) v1[offset] = pret.r;
*layer += c->data_stride; *layer += c->data_stride;
offset += c->vram_stride; offset += c->vram_stride;
@ -137,7 +139,7 @@ void bopti_grid(void **layer, int rows, struct command *c)
offset++; offset++;
} }
if(c->x) if(c->real_end)
{ {
v1[offset] = qret.r1; v1[offset] = qret.r1;
v2[offset] = qret.r2; v2[offset] = qret.r2;
@ -201,6 +203,7 @@ void bopti_render(bopti_image_t const *img, struct rbox *rbox, uint32_t *v1,
.columns = rbox->columns, .columns = rbox->columns,
.masks = masks + 2 * left_origin, .masks = masks + 2 * left_origin,
.real_start = (left_origin > 0), .real_start = (left_origin > 0),
.real_end = (rbox->x & 31) && (left_origin + img_columns < 5),
.vram_stride = 4 - rbox->columns, .vram_stride = 4 - rbox->columns,
.data_stride = ((img_columns - rbox->columns) << 2) * layers, .data_stride = ((img_columns - rbox->columns) << 2) * layers,
.gray = (v2 != NULL), .gray = (v2 != NULL),