From d3ef917bba580dee74506bb433984045f5fa8c39 Mon Sep 17 00:00:00 2001 From: firewave Date: Sat, 20 Jan 2018 12:17:43 +0100 Subject: [PATCH] fixed Coverity "Out-of-bounds write" warnings in drivers with VME (nw) --- src/devices/bus/vme/vme_hcpu30.cpp | 4 ++-- src/mame/drivers/fccpu30.cpp | 4 ++-- src/mame/drivers/hk68v10.cpp | 4 ++-- src/mame/drivers/mvme147.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp index 10c0ea842cb..30ed0c405f7 100644 --- a/src/devices/bus/vme/vme_hcpu30.cpp +++ b/src/devices/bus/vme/vme_hcpu30.cpp @@ -153,8 +153,8 @@ READ32_MEMBER(vme_hcpu30_card_device::bootvect_r) WRITE32_MEMBER(vme_hcpu30_card_device::bootvect_w) { LOG("%s\n", FUNCNAME); - m_sysram[offset % sizeof(m_sysram)] &= ~mem_mask; - m_sysram[offset % sizeof(m_sysram)] |= (data & mem_mask); + m_sysram[offset % ARRAY_LENGTH(m_sysram)] &= ~mem_mask; + m_sysram[offset % ARRAY_LENGTH(m_sysram)] |= (data & mem_mask); m_sysrom = &m_sysram[0]; // redirect all upcoming accesses to masking RAM until reset. } diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index 5894850520b..e74e0735589 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -424,8 +424,8 @@ READ32_MEMBER (cpu30_state::bootvect_r){ WRITE32_MEMBER (cpu30_state::bootvect_w){ LOG("%s\n", FUNCNAME); - m_sysram[offset % sizeof(m_sysram)] &= ~mem_mask; - m_sysram[offset % sizeof(m_sysram)] |= (data & mem_mask); + m_sysram[offset % ARRAY_LENGTH(m_sysram)] &= ~mem_mask; + m_sysram[offset % ARRAY_LENGTH(m_sysram)] |= (data & mem_mask); m_sysrom = &m_sysram[0]; // redirect all upcoming accesses to masking RAM until reset. } diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 335f3eceb66..92773e42053 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -279,8 +279,8 @@ READ16_MEMBER (hk68v10_state::bootvect_r){ WRITE16_MEMBER (hk68v10_state::bootvect_w){ LOG (("%s offset %08x, mask %08x, data %04x\n", FUNCNAME, offset, mem_mask, data)); - m_sysram[offset % sizeof(m_sysram)] &= ~mem_mask; - m_sysram[offset % sizeof(m_sysram)] |= (data & mem_mask); + m_sysram[offset % ARRAY_LENGTH(m_sysram)] &= ~mem_mask; + m_sysram[offset % ARRAY_LENGTH(m_sysram)] |= (data & mem_mask); m_sysrom = &m_sysram[0]; // redirect all upcoming accesses to masking RAM until reset. } diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp index ea4c5279023..35ba11abe0d 100644 --- a/src/mame/drivers/mvme147.cpp +++ b/src/mame/drivers/mvme147.cpp @@ -288,8 +288,8 @@ READ32_MEMBER (mvme147_state::bootvect_r){ } WRITE32_MEMBER (mvme147_state::bootvect_w){ - m_sysram[offset % sizeof(m_sysram)] &= ~mem_mask; - m_sysram[offset % sizeof(m_sysram)] |= (data & mem_mask); + m_sysram[offset % ARRAY_LENGTH(m_sysram)] &= ~mem_mask; + m_sysram[offset % ARRAY_LENGTH(m_sysram)] |= (data & mem_mask); m_sysrom = &m_sysram[0]; // redirect all upcoming accesses to masking RAM until reset. }