summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanović <mmicko@gmail.com>2016-03-27 08:20:31 +0200
committer Miodrag Milanović <mmicko@gmail.com>2016-03-27 08:20:31 +0200
commit72d1fb813df809720b2e2f91c9854f308f27f23f (patch)
treeda1e218684daa0a99fb44c34e8f4bacc7f660d88
parent39db5d582e3199ce4eb8d71b41dd14c0d918e9e3 (diff)
parentbeb8dbe1d24d28a0a4e5d0c89b151a4b7d71b349 (diff)
Merge pull request #747 from ajrhacker/options_bugfix
Avoid dereferencing null pointers in set_system_name (nw)
-rw-r--r--src/emu/emuopts.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index 38bcee35467..38624009588 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -580,8 +580,8 @@ void emu_options::set_system_name(const char *name)
// look up the software part
machine_config config(*cursystem, *this);
software_list_device *swlist = software_list_device::find_by_name(config, sw_list.c_str());
- software_info *swinfo = swlist->find(sw_name.c_str());
- software_part *swpart = swinfo->find_part(sw_part.c_str());
+ software_info *swinfo = swlist != nullptr ? swlist->find(sw_name.c_str()) : nullptr;
+ software_part *swpart = swinfo != nullptr ? swinfo->find_part(sw_part.c_str()) : nullptr;
// then add the options
if (new_system)