Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-13 09:28:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

gb_lcd.c: Prevent some out of bound array accesses (nw)

Browse Source
This commit is contained in:
Wilbert Pol 2014-07-27 20:05:44 +00:00
parent 78d3bd416d
commit b8e337341b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mess/video/gb_lcd.c
View File

@ -1186,14 +1186,17 @@ void cgb_lcd_device::update_sprites()
case 0x00: /* priority is not set (overlaps bgnd & wnd, don't flip x) */ case 0x00: /* priority is not set (overlaps bgnd & wnd, don't flip x) */
for (bit = 0; bit < 8; bit++, xindex++) for (bit = 0; bit < 8; bit++, xindex++)
{ {
register int colour = ((data & 0x8000) ? 2 : 0) | ((data & 0x0080) ? 1 : 0); if (xindex >= 0 && xindex < 160)
if ((m_bg_zbuf[xindex] & 0x80) && (m_bg_zbuf[xindex] & 0x7f) && (LCDCONT & 0x1))
colour = 0;
if (colour && xindex >= 0 && xindex < 160)
{ {
if (!m_gbc_mode) register int colour = ((data & 0x8000) ? 2 : 0) | ((data & 0x0080) ? 1 : 0);
colour = pal ? m_gb_spal1[colour] : m_gb_spal0[colour]; if ((m_bg_zbuf[xindex] & 0x80) && (m_bg_zbuf[xindex] & 0x7f) && (LCDCONT & 0x1))
plot_pixel(bitmap, xindex, yindex, m_cgb_spal[pal + colour]); colour = 0;
if (colour)
{
if (!m_gbc_mode)
colour = pal ? m_gb_spal1[colour] : m_gb_spal0[colour];
plot_pixel(bitmap, xindex, yindex, m_cgb_spal[pal + colour]);
}
} }
data <<= 1; data <<= 1;
} }