ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

elan: don't crash on invalid texture xfer size 

Issue #647: fixes initdv3jb area conquered crash
This commit is contained in:
Flyinghead 2022-06-06 15:54:25 +02:00
parent 917cc7f27c
commit b5f1552ed8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/hw/pvr/elan.cpp
View File

@ -1582,6 +1582,12 @@ static void executeCommand(u8 *data, int size)
if (link->offset & 0x80000000)
{
// elan v10 only
if (link->size > VRAM_SIZE)
{
WARN_LOG(PVR, "Texture DMA from %x to %x (%x invalid)", DMAC_SAR(2), link->vramAddress & 0x1ffffff8, link->size);
size = 0;
break;
}
DEBUG_LOG(PVR, "Texture DMA from %x to %x (%x)", DMAC_SAR(2), link->vramAddress & 0x1ffffff8, link->size);
memcpy(&vram[link->vramAddress & VRAM_MASK], &mem_b[DMAC_SAR(2) & RAM_MASK], link->size);
reg74 |= 1;
@ -1589,6 +1595,12 @@ static void executeCommand(u8 *data, int size)
else if (link->offset & 0x20000000)
{
// elan v10 only
if (link->size > VRAM_SIZE)
{
WARN_LOG(PVR, "Texture DMA from eram %x -> %x (%x invalid)", link->offset & ELAN_RAM_MASK, link->vramAddress & VRAM_MASK, link->size);
size = 0;
break;
}
DEBUG_LOG(PVR, "Texture DMA from eram %x -> %x (%x)", link->offset & ELAN_RAM_MASK, link->vramAddress & VRAM_MASK, link->size);
memcpy(&vram[link->vramAddress & VRAM_MASK], &RAM[link->offset & ELAN_RAM_MASK], link->size);
reg74 |= 1;