Message ID | 20190930163027.11686-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 75fefb1fb7ac8b423e08a8dca19b19884a325ebf |
Headers | show |
On 9/30/2019 1:30 PM, Michael Niedermayer wrote: > Fixes: signed integer overflow: 2 * -1306460384 cannot be represented in type 'int' > Fixes: 17685/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_fuzzer-5747390337777664 > Fixes: 17688/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5739287210885120 > Fixes: 17699/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5678394531905536 > Fixes: 17738/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5763415733174272 > Fixes: 17746/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_RDFT_fuzzer-5703008159006720 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/utils.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > index a19e0086cb..6cc770b1ea 100644 > --- a/libavcodec/utils.c > +++ b/libavcodec/utils.c > @@ -689,6 +689,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code > ret = AVERROR(EINVAL); > goto free_and_end; > } > + if (avctx->sample_rate < 0) { > + av_log(avctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", avctx->sample_rate); > + ret = AVERROR(EINVAL); > + goto free_and_end; > + } > > avctx->codec = codec; > if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && > LGTM. I suppose this supersedes the previous patch doing the same thing?
On Mon, Sep 30, 2019 at 01:49:25PM -0300, James Almer wrote: > On 9/30/2019 1:30 PM, Michael Niedermayer wrote: > > Fixes: signed integer overflow: 2 * -1306460384 cannot be represented in type 'int' > > Fixes: 17685/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_fuzzer-5747390337777664 > > Fixes: 17688/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5739287210885120 > > Fixes: 17699/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5678394531905536 > > Fixes: 17738/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5763415733174272 > > Fixes: 17746/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_RDFT_fuzzer-5703008159006720 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/utils.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > > index a19e0086cb..6cc770b1ea 100644 > > --- a/libavcodec/utils.c > > +++ b/libavcodec/utils.c > > @@ -689,6 +689,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code > > ret = AVERROR(EINVAL); > > goto free_and_end; > > } > > + if (avctx->sample_rate < 0) { > > + av_log(avctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", avctx->sample_rate); > > + ret = AVERROR(EINVAL); > > + goto free_and_end; > > + } > > > > avctx->codec = codec; > > if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && > > > > LGTM. > I suppose this supersedes the previous patch doing the same thing? yes [...]
On Mon, Sep 30, 2019 at 01:49:25PM -0300, James Almer wrote: > On 9/30/2019 1:30 PM, Michael Niedermayer wrote: > > Fixes: signed integer overflow: 2 * -1306460384 cannot be represented in type 'int' > > Fixes: 17685/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_fuzzer-5747390337777664 > > Fixes: 17688/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5739287210885120 > > Fixes: 17699/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5678394531905536 > > Fixes: 17738/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5763415733174272 > > Fixes: 17746/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_RDFT_fuzzer-5703008159006720 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/utils.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > > index a19e0086cb..6cc770b1ea 100644 > > --- a/libavcodec/utils.c > > +++ b/libavcodec/utils.c > > @@ -689,6 +689,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code > > ret = AVERROR(EINVAL); > > goto free_and_end; > > } > > + if (avctx->sample_rate < 0) { > > + av_log(avctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", avctx->sample_rate); > > + ret = AVERROR(EINVAL); > > + goto free_and_end; > > + } > > > > avctx->codec = codec; > > if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && > > > > LGTM. I suppose this supersedes the previous patch doing the same thing? will apply thx [...]
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a19e0086cb..6cc770b1ea 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -689,6 +689,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = AVERROR(EINVAL); goto free_and_end; } + if (avctx->sample_rate < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", avctx->sample_rate); + ret = AVERROR(EINVAL); + goto free_and_end; + } avctx->codec = codec; if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) &&
Fixes: signed integer overflow: 2 * -1306460384 cannot be represented in type 'int' Fixes: 17685/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_fuzzer-5747390337777664 Fixes: 17688/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5739287210885120 Fixes: 17699/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5678394531905536 Fixes: 17738/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5763415733174272 Fixes: 17746/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_RDFT_fuzzer-5703008159006720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/utils.c | 5 +++++ 1 file changed, 5 insertions(+)