From 28b4d74ada1630073b47dccb020399e49d316be0 Mon Sep 17 00:00:00 2001 From: angelosa Date: Tue, 3 Oct 2017 18:46:42 +0200 Subject: [PATCH] Fixed STV crashing regression, make m_cart_reg explicitly nullptr if not initialized (nw) --- src/devices/machine/smpc.cpp | 3 ++- src/mame/drivers/stv.cpp | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp index 9d519454042..e0ca640ea0c 100644 --- a/src/devices/machine/smpc.cpp +++ b/src/devices/machine/smpc.cpp @@ -572,7 +572,8 @@ void saturn_state::smpc_comreg_exec(address_space &space, uint8_t data, uint8_t case 0x0a: case 0x0b: popmessage ("SMPC: NETLINK %s, contact MAMEdev",(data & 1) ? "off" : "on"); - break; case 0x0d: + break; + case 0x0d: if(LOG_SMPC) printf ("SMPC: System Reset\n"); smpc_system_reset(); break; diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index d8de70f6fe8..a27a6df6ab0 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1158,11 +1158,18 @@ MACHINE_RESET_MEMBER(stv_state,stv) m_cart_reg[0] = memregion("cart"); if (m_cart2) m_cart_reg[1] = memregion(region_tag.assign(m_cart2->tag()).append(GENERIC_ROM_REGION_TAG).c_str()); + else + m_cart_reg[1] = nullptr; if (m_cart3) m_cart_reg[2] = memregion(region_tag.assign(m_cart3->tag()).append(GENERIC_ROM_REGION_TAG).c_str()); + else + m_cart_reg[2] = nullptr; if (m_cart4) m_cart_reg[3] = memregion(region_tag.assign(m_cart4->tag()).append(GENERIC_ROM_REGION_TAG).c_str()); + else + m_cart_reg[3] = nullptr; + m_en_68k = 0; m_NMI_reset = 0;