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

Fix NRE when flushing SaveRAM in GambatteLink for some roms 

fixes d788e603f
not clear on the reproduction steps, but it will of course involve a rom
which triggers the "no SaveRAM, return null" in Gambatte
This commit is contained in:
YoshiRulz 2024-06-01 17:28:33 +10:00
parent a03050dcc5
commit 64db1febbb
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Emulation.Common/Base Implementations/LinkedSaveRam.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Emulation.Common
int len = 0;
for (int i = 0; i < _numCores; i++)
{
linkedBuffers.Add(_linkedCores[i].AsSaveRam().CloneSaveRam()!);
linkedBuffers.Add(_linkedCores[i].AsSaveRam().CloneSaveRam() ?? Array.Empty<byte>());
len += linkedBuffers[i].Length;
}
byte[] ret = new byte[len];
@ -56,7 +56,9 @@ namespace BizHawk.Emulation.Common
int pos = 0;
for (int i = 0; i < _numCores; i++)
{
var b = new byte[_linkedCores[i].AsSaveRam().CloneSaveRam()!.Length];
var toCopy = _linkedCores[i].AsSaveRam().CloneSaveRam(); // wait CloneSaveRam is already a copy, why are we copying it again
if (toCopy is null) continue;
var b = new byte[toCopy.Length];
Buffer.BlockCopy(data, pos, b, 0, b.Length);
pos += b.Length;
_linkedCores[i].AsSaveRam().StoreSaveRam(b);