From d3e10b434780e914afce327f9a6a9ef0ec7e14e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Thu, 22 Jan 2015 13:27:33 +0100 Subject: fixed -fsanitize=null error in address_space::prepare_map() (nw) by Olivier Galibert --- src/emu/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emu/memory.c b/src/emu/memory.c index fc4b79971d0..3224e9d11d2 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1811,7 +1811,7 @@ void address_space::prepare_map() m_map.reset(global_alloc(address_map(m_device, m_spacenum))); // merge in the submaps - m_map->uplift_submaps(machine(), m_device, *m_device.owner(), endianness()); + m_map->uplift_submaps(machine(), m_device, m_device.owner() ? *m_device.owner() : m_device, endianness()); // extract global parameters specified by the map m_unmap = (m_map->m_unmapval == 0) ? 0 : ~0; -- cgit v1.2.3