Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Performs argument checking on the return value of CassetteLegacyWaveFiller.chunk_sample_calc()

Browse Source 
This is just better error checking.  You can see this if you create a garbage file named 'foo.csw' and invoke the following command:

	mame bbcb -cass1 foo.csw

With this change you get an invalid image error.  Without it, you get this:

	Caught unhandled St12length_error exception: vector::_M_default_append
This commit is contained in:
Nathan Woods 2016-08-23 07:56:48 -04:00
parent d64c4c6b6c
commit 846cd43287
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/formats/cassimg.cpp
View File

@ -903,7 +903,7 @@ cassette_image::error cassette_legacy_construct(cassette_image *cassette,
chunk.resize(args.chunk_size); chunk.resize(args.chunk_size);
/* determine number of samples */ /* determine number of samples */
if (args.chunk_sample_calc) if (args.chunk_sample_calc != nullptr)
{ {
if (size > 0x7FFFFFFF) if (size > 0x7FFFFFFF)
{ {
@ -915,6 +915,13 @@ cassette_image::error cassette_legacy_construct(cassette_image *cassette,
cassette_image_read(cassette, &bytes[0], 0, size); cassette_image_read(cassette, &bytes[0], 0, size);
sample_count = args.chunk_sample_calc(&bytes[0], (int)size); sample_count = args.chunk_sample_calc(&bytes[0], (int)size);
// chunk_sample_calc functions report errors by returning negative numbers
if (sample_count < 0)
{
err = cassette_image::error::INVALID_IMAGE;
goto done;
}
if (args.header_samples < 0) if (args.header_samples < 0)
args.header_samples = sample_count; args.header_samples = sample_count;
} }