summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-07-22 11:40:05 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-07-22 11:40:05 +0000
commit34847974ebd432044d4cc8a5e7d7537594886293 (patch)
treeffa29ce0cc3422f0318891336d7204924137a4e9
parent1f2fd69115617af88e7b71ffad4a04a70151a31a (diff)
fixed array out-of-bounds access in src/mame/drivers/merit.c (nw)
-rw-r--r--src/mame/drivers/merit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index d5fb7ada013..d47c3017bdc 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -295,7 +295,7 @@ static MC6845_UPDATE_ROW( update_row )
col |= 0x03;
col = state->m_ram_palette[col & 0x3ff];
- bitmap.pix32(y, x) = pens[col ? col : (state->m_lscnblk ? 8 : 0)];
+ bitmap.pix32(y, x) = pens[col ? col & (NUM_PENS-1) : (state->m_lscnblk ? 8 : 0)];
x++;
}