Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

return false on bad header

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2013-12-01 12:46:18 +00:00
parent ca00a0eda3
commit 28163a52ae
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emu/sound/mpeg_audio.c
View File

@ -92,7 +92,8 @@ bool mpeg_audio::decode_buffer(int &pos, int limit, short *output,
abort(); abort();
case 4: case 4:
try { try {
read_header_amm(variant == 2); if (!read_header_amm(variant == 2))
return false;
read_data_mpeg2(); read_data_mpeg2();
decode_mpeg2(output, output_samples); decode_mpeg2(output, output_samples);
} catch(limit_hit) { } catch(limit_hit) {
@ -110,7 +111,7 @@ bool mpeg_audio::decode_buffer(int &pos, int limit, short *output,
return true; return true;
} }
void mpeg_audio::read_header_amm(bool layer25) bool mpeg_audio::read_header_amm(bool layer25)
{ {
gb(1); // unused gb(1); // unused
int full_packets_count = gb(4); // max 12 int full_packets_count = gb(4); // max 12
@ -122,6 +123,9 @@ void mpeg_audio::read_header_amm(bool layer25)
int stereo_mode_ext = gb(2); int stereo_mode_ext = gb(2);
param_index = gb(3); param_index = gb(3);
gb(1); // must be zero gb(1); // must be zero
if (last_frame_number == 0)
return false;
channel_count = stereo_mode != 3 ? 2 : 1; channel_count = stereo_mode != 3 ? 2 : 1;
@ -131,6 +135,8 @@ void mpeg_audio::read_header_amm(bool layer25)
joint_bands = joint_band_counts[stereo_mode_ext]; joint_bands = joint_band_counts[stereo_mode_ext];
if(joint_bands > total_bands ) if(joint_bands > total_bands )
joint_bands = total_bands; joint_bands = total_bands;
return true;
} }
void mpeg_audio::read_header_mpeg2(bool layer25) void mpeg_audio::read_header_mpeg2(bool layer25)

2
src/emu/sound/mpeg_audio.h
View File

@ -93,7 +93,7 @@ private:
int current_pos, current_limit; int current_pos, current_limit;
void read_header_amm(bool layer25); bool read_header_amm(bool layer25);
void read_header_mpeg2(bool layer25); void read_header_mpeg2(bool layer25);
void read_data_mpeg2(); void read_data_mpeg2();
void decode_mpeg2(short *output, int &output_samples); void decode_mpeg2(short *output, int &output_samples);