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

Fix heap corruption when loading a new chd fails. Throw CHDERR_FILE_NOT_WRITEABLE rather than CHDERR_UNSUPPORTED_VERSION if you try to open an old version for writing [smf]

Browse Source
This commit is contained in:
smf- 2016-11-06 12:17:48 +00:00
parent a8d851fc57
commit e565b0c6aa
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/imagedev/harddriv.cpp
View File

@ -112,8 +112,11 @@ void harddisk_image_device::device_start()
void harddisk_image_device::device_stop() void harddisk_image_device::device_stop()
{ {
if (m_hard_disk_handle) if (m_hard_disk_handle != nullptr)
{
hard_disk_close(m_hard_disk_handle); hard_disk_close(m_hard_disk_handle);
m_hard_disk_handle = nullptr;
}
} }
image_init_result harddisk_image_device::call_load() image_init_result harddisk_image_device::call_load()
@ -234,8 +237,11 @@ image_init_result harddisk_image_device::internal_load_hd()
m_chd = nullptr; m_chd = nullptr;
if (m_hard_disk_handle) if (m_hard_disk_handle != nullptr)
{
hard_disk_close(m_hard_disk_handle); hard_disk_close(m_hard_disk_handle);
m_hard_disk_handle = nullptr;
}
/* open the CHD file */ /* open the CHD file */
if (software_entry() != nullptr) if (software_entry() != nullptr)

7
src/lib/util/chd.cpp
View File

@ -2397,10 +2397,7 @@ chd_error chd_file::open_common(bool writeable)
if (memcmp(rawheader, "MComprHD", 8) != 0) if (memcmp(rawheader, "MComprHD", 8) != 0)
throw CHDERR_INVALID_FILE; throw CHDERR_INVALID_FILE;
// only allow writes to the most recent version
m_version = be_read(&rawheader[12], 4); m_version = be_read(&rawheader[12], 4);
if (writeable && m_version < HEADER_VERSION)
throw CHDERR_UNSUPPORTED_VERSION;
// read the header if we support it // read the header if we support it
util::sha1_t parentsha1 = util::sha1_t::null; util::sha1_t parentsha1 = util::sha1_t::null;
@ -2412,6 +2409,10 @@ chd_error chd_file::open_common(bool writeable)
default: throw CHDERR_UNSUPPORTED_VERSION; default: throw CHDERR_UNSUPPORTED_VERSION;
} }
// only allow writes to the most recent version
if (m_version < HEADER_VERSION)
m_allow_writes = false;
if (writeable && !m_allow_writes) if (writeable && !m_allow_writes)
throw CHDERR_FILE_NOT_WRITEABLE; throw CHDERR_FILE_NOT_WRITEABLE;