ffmpeg | branch: release/5.1 | Michael Niedermayer <mich...@niedermayer.cc> | Thu Jul 21 00:20:41 2022 +0200| [6a7842560450da25fb4184ff11dbb8b8791e8703] | committer: Michael Niedermayer
avcodec/ffv1dec: Fix AC_GOLOMB_RICE min size check Found-by: mkver Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit f7d510b33ff33d2f5cb096017ee1c00f624cc138) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a7842560450da25fb4184ff11dbb8b8791e8703 --- libavcodec/ffv1dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index fd8088f16c..9300297267 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -884,9 +884,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, return AVERROR_INVALIDDATA; } else { int w = avctx->width; - for (int i = 0; w > (1<<ff_log2_run[i]); i++) + int s = 1 + w / (1<<23); + + w /= s; + + for (i = 0; w > (1<<ff_log2_run[i]); i++) w -= ff_log2_run[i]; - if (buf_size < (avctx->height + i + 6)/ 8) + if (buf_size < (avctx->height + i + 6) / 8 * s) return AVERROR_INVALIDDATA; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
