mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 01:25:33 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #5769 from 86Box/tc1995

Browse Source 
Add sanity checks to the Gameport pointer (July 10th, 2025)
This commit is contained in:
Jasmine Iwanek
2025-07-09 20:05:32 -04:00
committed by GitHub
parent baee4bacf3 ef17a9f3f2
commit 7170592d14
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/gameport.c
View File

@@ -306,6 +306,9 @@ gameport_remap(void *priv, uint16_t address)
gameport_t *dev = (gameport_t *) priv;
gameport_t *other_dev;
if (dev == NULL)
return;
if (dev->addr) {
/* Remove this port from the active ports list. */
if (active_gameports == dev) {

14
src/sound/snd_sb.c
View File

@@ -1152,11 +1152,14 @@ sb_ct1745_mixer_write(uint16_t addr, uint8_t val, void *priv)
else if ((val & 0x06) == 0x02)
mpu401_change_addr(sb->mpu, 0);
}
sb->gameport_addr = 0;
gameport_remap(sb->gameport, 0);
if (!(val & 0x01)) {
sb->gameport_addr = 0x200;
gameport_remap(sb->gameport, 0x200);
if (sb->gameport != NULL) {
gameport_remap(sb->gameport, 0);
if (!(val & 0x01)) {
sb->gameport_addr = 0x200;
gameport_remap(sb->gameport, 0x200);
}
}
}
break;
@@ -1619,7 +1622,8 @@ ess_mixer_write(uint16_t addr, uint8_t val, void *priv)
ess_fm_midi_write, NULL, NULL,
ess);
gameport_remap(ess->gameport, !(mixer->regs[0x40] & 0x2) ? 0x00 : 0x200);
if (ess->gameport != NULL)
gameport_remap(ess->gameport, !(mixer->regs[0x40] & 0x2) ? 0x00 : 0x200);
if (ess->dsp.sb_subtype > SB_SUBTYPE_ESS_ES1688) {
/* Not on ES1688. */