Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 07:52:35 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

validity.cpp: Be a bit more paranoid with null pointer checks; also disallow empty strings in BIOS definitions

Browse Source
This commit is contained in:
AJR 2023-02-12 19:00:40 -05:00
parent d791aecebd
commit b952a5dde6
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/emu/validity.cpp
View File

@ -2151,28 +2151,38 @@ void validity_checker::validate_roms(device_t &root)
int const bios_flags = ROM_GETBIOSFLAGS(romp);
char const *const biosname = romp->name;
if (bios_flags != last_bios + 1)
osd_printf_error("Non-sequential BIOS %s (specified as %d, expected to be %d)\n", biosname, bios_flags - 1, last_bios);
osd_printf_error("Non-sequential BIOS %s (specified as %d, expected to be %d)\n", biosname ? biosname : "UNNAMED", bios_flags - 1, last_bios);
last_bios = bios_flags;
// validate the name
if (strlen(biosname) > 16)
osd_printf_error("BIOS name %s exceeds maximum 16 characters\n", biosname);
for (char const *s = biosname; *s; ++s)
if (!biosname || biosname[0] == 0)
osd_printf_error("BIOS %d is missing a name\n", bios_flags - 1);
else
{
if (((*s < '0') || (*s > '9')) && ((*s < 'a') || (*s > 'z')) && (*s != '.') && (*s != '_') && (*s != '-'))
if (strlen(biosname) > 16)
osd_printf_error("BIOS name %s exceeds maximum 16 characters\n", biosname);
for (char const *s = biosname; *s; ++s)
{
osd_printf_error("BIOS name %s contains invalid characters\n", biosname);
break;
if (((*s < '0') || (*s > '9')) && ((*s < 'a') || (*s > 'z')) && (*s != '.') && (*s != '_') && (*s != '-'))
{
osd_printf_error("BIOS name %s contains invalid characters\n", biosname);
break;
}
}
// check for duplicate names/descriptions
auto const nameins = bios_names.emplace(biosname, bios_flags);
if (!nameins.second)
osd_printf_error("Duplicate BIOS name %s specified (%d and %d)\n", biosname, nameins.first->second, bios_flags - 1);
if (!romp->hashdata || romp->hashdata[0] == 0)
osd_printf_error("BIOS %s has empty description\n", biosname);
else
{
auto const descins = bios_descs.emplace(romp->hashdata, biosname);
if (!descins.second)
osd_printf_error("BIOS %s has duplicate description '%s' (was %s)\n", biosname, romp->hashdata, descins.first->second);
}
}
// check for duplicate names/descriptions
auto const nameins = bios_names.emplace(biosname, bios_flags);
if (!nameins.second)
osd_printf_error("Duplicate BIOS name %s specified (%d and %d)\n", biosname, nameins.first->second, bios_flags - 1);
auto const descins = bios_descs.emplace(romp->hashdata, biosname);
if (!descins.second)
osd_printf_error("BIOS %s has duplicate description '%s' (was %s)\n", biosname, romp->hashdata, descins.first->second);
}
else if (ROMENTRY_ISDEFAULT_BIOS(romp)) // if this is a default BIOS setting, remember it so it to check at the end
{
@ -2325,7 +2335,7 @@ void validity_checker::validate_dip_settings(const ioport_field &field)
{
char const *const demo_sounds = ioport_string_from_index(INPUT_STRING_Demo_Sounds);
char const *const flipscreen = ioport_string_from_index(INPUT_STRING_Flip_Screen);
char const *const name = field.specific_name();
char const *const name = field.specific_name() ? field.specific_name() : "UNNAMED";
u8 coin_list[__input_string_coinage_end + 1 - __input_string_coinage_start] = { 0 };
bool coin_error = false;
@ -2394,6 +2404,12 @@ void validity_checker::validate_dip_settings(const ioport_field &field)
void validity_checker::validate_condition(const ioport_condition &condition, device_t &device)
{
if (condition.tag() == nullptr)
{
osd_printf_error("Condition referencing null ioport tag\n");
return;
}
// resolve the tag, then find a matching port
if (m_ioport_set.find(device.subtag(condition.tag())) == m_ioport_set.end())
osd_printf_error("Condition referencing non-existent ioport tag '%s'\n", condition.tag());
@ -2486,6 +2502,12 @@ void validity_checker::validate_inputs(device_t &root)
if (field.specific_name() == nullptr)
osd_printf_error("Config switch has no specific name\n");
}
else if (field.type() == IPT_ADJUSTER)
{
// adjuster fields must have a specific name
if (field.specific_name() == nullptr)
osd_printf_error("Adjuster has no specific name\n");
}
// verify names
char const *const name = field.specific_name();

4
src/mame/dec/jensen.cpp
View File

@ -251,7 +251,7 @@ ROM_START(d2k300axp)
ROM_LOAD("srom.bin", 0x00000, 0x2000, NO_DUMP)
ROM_REGION32_LE(0x100000, "feprom1", 0)
ROM_SYSTEM_BIOS(0, "feprom", "")
ROM_SYSTEM_BIOS(0, "feprom", "Unknown version")
ROMX_LOAD("feprom1.bin", 0x00000, 0x100000, NO_DUMP, ROM_BIOS(0))
ROM_END
@ -260,7 +260,7 @@ ROM_START(d2k500axp)
ROM_LOAD("srom.bin", 0x00000, 0x2000, NO_DUMP)
ROM_REGION32_LE(0x100000, "feprom1", 0)
ROM_SYSTEM_BIOS(0, "feprom", "")
ROM_SYSTEM_BIOS(0, "feprom", "Unknown version")
ROMX_LOAD("feprom1.bin", 0x00000, 0x100000, NO_DUMP, ROM_BIOS(0))
ROM_END