highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/electronicarts: Check if there are any streams

Browse Source 
Fixes: Assertion failure (invalid stream index)
Fixes: 25120/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6565251898933248

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2020-09-07 00:09:33 +02:00
parent a12864938d
commit 39a98623ed
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/electronicarts.c
View File

@@ -530,20 +530,17 @@ static int ea_read_header(AVFormatContext *s)
if (ea->num_channels <= 0 || ea->num_channels > 2) { if (ea->num_channels <= 0 || ea->num_channels > 2) {
av_log(s, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"Unsupported number of channels: %d\n", ea->num_channels); "Unsupported number of channels: %d\n", ea->num_channels);
ea->audio_codec = 0; goto no_audio;
return 1;
} }
if (ea->sample_rate <= 0) { if (ea->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Unsupported sample rate: %d\n", ea->sample_rate); "Unsupported sample rate: %d\n", ea->sample_rate);
ea->audio_codec = 0; goto no_audio;
return 1;
} }
if (ea->bytes <= 0 || ea->bytes > 2) { if (ea->bytes <= 0 || ea->bytes > 2) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Invalid number of bytes per sample: %d\n", ea->bytes); "Invalid number of bytes per sample: %d\n", ea->bytes);
ea->audio_codec = AV_CODEC_ID_NONE; goto no_audio;
return 1;
} }
/* initialize the audio decoder stream */ /* initialize the audio decoder stream */
@@ -564,8 +561,13 @@ static int ea_read_header(AVFormatContext *s)
st->codecpar->bits_per_coded_sample; st->codecpar->bits_per_coded_sample;
ea->audio_stream_index = st->index; ea->audio_stream_index = st->index;
st->start_time = 0; st->start_time = 0;
return 1;
} }
no_audio:
ea->audio_codec = AV_CODEC_ID_NONE;
if (!ea->video.codec)
return AVERROR_INVALIDDATA;
return 1; return 1;
} }