0
0
Fork 0
mirror of https://git.sr.ht/~rabbits/uxn synced 2024-12-18 06:20:18 +00:00

Fixed PPU out-of-bounds crash

This commit is contained in:
Andrew Alderwick 2021-09-20 23:12:11 +01:00
parent a8df7ca410
commit 81ab3a7a74

View file

@ -22,7 +22,7 @@ static Uint8 blending[5][16] = {
static void static void
ppu_clear(Ppu *p) ppu_clear(Ppu *p)
{ {
int i; unsigned int i;
for(i = 0; i < p->stride * p->height; ++i) for(i = 0; i < p->stride * p->height; ++i)
p->dat[i] = 0; p->dat[i] = 0;
} }
@ -30,8 +30,10 @@ ppu_clear(Ppu *p)
unsigned int unsigned int
ppu_pixel(Ppu *p, int fg, Uint16 x, Uint16 y, Uint8 color) ppu_pixel(Ppu *p, int fg, Uint16 x, Uint16 y, Uint8 color)
{ {
unsigned int i = x / PPW + y * p->stride, shift = x % PPW * 4; unsigned int ret, i = x / PPW + y * p->stride, shift = x % PPW * 4;
unsigned int ret = p->dat[i]; if(x >= p->width || y >= p->height)
return 0;
ret = p->dat[i];
if(fg) shift += 2; if(fg) shift += 2;
p->dat[i] &= ~(3 << shift); p->dat[i] &= ~(3 << shift);
p->dat[i] |= color << shift; p->dat[i] |= color << shift;