From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/ratecontrol: Handle wanted bits overflow
Date: Tue, 18 Jun 2024 15:48:22 +0200
Message-ID: <20240618134826.2189719-3-michael@niedermayer.cc> (raw)
In-Reply-To: <20240618134826.2189719-1-michael@niedermayer.cc>
Fixes: 5.92611e+20 is outside the range of representable values of type 'unsigned long'
Fixes: 68984/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-5155755073273856
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/ratecontrol.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index df27639ca73..86ec7a3443e 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -936,6 +936,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
wanted_bits = rce->expected_bits;
} else {
const MPVPicture *dts_pic;
+ double wanted_bits_double;
rce = &local_rce;
/* FIXME add a dts field to AVFrame and ensure it is set and use it
@@ -947,9 +948,14 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
dts_pic = s->last_pic.ptr;
if (!dts_pic || dts_pic->f->pts == AV_NOPTS_VALUE)
- wanted_bits = (uint64_t)(s->bit_rate * (double)picture_number / fps);
+ wanted_bits_double = s->bit_rate * (double)picture_number / fps;
else
- wanted_bits = (uint64_t)(s->bit_rate * (double)dts_pic->f->pts / fps);
+ wanted_bits_double = s->bit_rate * (double)dts_pic->f->pts / fps;
+ if (wanted_bits_double > INT64_MAX) {
+ av_log(s, AV_LOG_WARNING, "Bits exceed 64bit range\n");
+ wanted_bits = INT64_MAX;
+ } else
+ wanted_bits = (int64_t)wanted_bits_double;
}
diff = s->total_bits - wanted_bits;
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-06-18 13:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 13:48 [FFmpeg-devel] [PATCH 1/7] avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 when motion estimation is used Michael Niedermayer
2024-06-18 13:48 ` [FFmpeg-devel] [PATCH 2/7] avcodec/ratecontrol: Try to keep fps as a rational Michael Niedermayer
2024-06-25 19:52 ` Michael Niedermayer
2024-06-18 13:48 ` Michael Niedermayer [this message]
2024-07-15 14:00 ` [FFmpeg-devel] [PATCH 3/7] avcodec/ratecontrol: Handle wanted bits overflow Michael Niedermayer
2024-06-18 13:48 ` [FFmpeg-devel] [PATCH 4/7] avcodec/snowenc: MV limits due to mv_penalty table size Michael Niedermayer
2024-06-18 13:48 ` [FFmpeg-devel] [PATCH 5/7] avcodec/jfdctint_template: Fewer integer anomalies Michael Niedermayer
2024-06-18 13:48 ` [FFmpeg-devel] [PATCH 6/7] avcodec/vc2enc: Fix overflows with storing large values Michael Niedermayer
2024-06-18 13:48 ` [FFmpeg-devel] [PATCH 7/7] avcodec/proresenc_kostya: use unsigned alpha for rotation Michael Niedermayer
2024-07-10 19:48 ` Michael Niedermayer
2024-06-18 17:28 ` [FFmpeg-devel] [PATCH 1/7] avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 when motion estimation is used Andreas Rheinhardt
2024-07-15 13:59 ` Michael Niedermayer
2024-07-31 19:49 ` Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240618134826.2189719-3-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git