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

ffmdec: validate sample_rate

Browse Source 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-10-23 16:05:01 +02:00
parent 872fcfcc0f
commit 0009457dc0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/ffmdec.c
View File

@ -432,6 +432,11 @@ static int ffm2_read_header(AVFormatContext *s)
goto fail; goto fail;
} }
codec->sample_rate = avio_rb32(pb); codec->sample_rate = avio_rb32(pb);
if (codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", codec->sample_rate);
ret = AVERROR_INVALIDDATA;
goto fail;
}
codec->channels = avio_rl16(pb); codec->channels = avio_rl16(pb);
codec->frame_size = avio_rl16(pb); codec->frame_size = avio_rl16(pb);
break; break;
@ -628,6 +633,10 @@ static int ffm_read_header(AVFormatContext *s)
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
codec->sample_rate = avio_rb32(pb); codec->sample_rate = avio_rb32(pb);
if (codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", codec->sample_rate);
goto fail;
}
codec->channels = avio_rl16(pb); codec->channels = avio_rl16(pb);
codec->frame_size = avio_rl16(pb); codec->frame_size = avio_rl16(pb);
break; break;