virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

nuv: 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 17:08:51 +02:00
parent 2c818c3821
commit f748e3b5a2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/nuv.c
View File

@ -66,7 +66,7 @@ static int nuv_probe(AVProbeData *p)
* @param myth set if this is a MythTVVideo format file * @param myth set if this is a MythTVVideo format file
* @return 0 or AVERROR code * @return 0 or AVERROR code
*/ */
static int get_codec_data(AVIOContext *pb, AVStream *vst, static int get_codec_data(AVFormatContext *s, AVIOContext *pb, AVStream *vst,
AVStream *ast, int myth) AVStream *ast, int myth)
{ {
nuv_frametype frametype; nuv_frametype frametype;
@ -114,6 +114,10 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst,
ast->codecpar->codec_tag = avio_rl32(pb); ast->codecpar->codec_tag = avio_rl32(pb);
ast->codecpar->sample_rate = avio_rl32(pb); ast->codecpar->sample_rate = avio_rl32(pb);
if (ast->codecpar->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", ast->codecpar->sample_rate);
return AVERROR_INVALIDDATA;
}
ast->codecpar->bits_per_coded_sample = avio_rl32(pb); ast->codecpar->bits_per_coded_sample = avio_rl32(pb);
ast->codecpar->channels = avio_rl32(pb); ast->codecpar->channels = avio_rl32(pb);
ast->codecpar->channel_layout = 0; ast->codecpar->channel_layout = 0;
@ -232,7 +236,7 @@ static int nuv_header(AVFormatContext *s)
} else } else
ctx->a_id = -1; ctx->a_id = -1;
if ((ret = get_codec_data(pb, vst, ast, is_mythtv)) < 0) if ((ret = get_codec_data(s, pb, vst, ast, is_mythtv)) < 0)
return ret; return ret;
ctx->rtjpg_video = vst && vst->codecpar->codec_id == AV_CODEC_ID_NUV; ctx->rtjpg_video = vst && vst->codecpar->codec_id == AV_CODEC_ID_NUV;