From f4fb3436fe4b24e1beecaab8ce0fbf471f1a99df Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 6 May 2017 01:15:59 -0400 Subject: [PATCH] This is now totally fatal, so use a proper error message (nw) --- src/emu/emumem.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emu/emumem.cpp b/src/emu/emumem.cpp index 146c82fe5b6..debc9cbdd05 100644 --- a/src/emu/emumem.cpp +++ b/src/emu/emumem.cpp @@ -4337,7 +4337,8 @@ void handler_entry::configure_subunits(u64 handlermask, int handlerbits, int &st if ((scanmask & unitmask) != 0) count++; } - assert(count > 0 && count <= maxunits); + if (count == 0 || count > maxunits) + throw emu_fatalerror("Invalid subunit mask %s for %d-bit space", core_i64_hex_format(handlermask, m_datawidth / 4), m_datawidth); // make sure that the multiplier is a power of 2 int multiplier = count;