From ed9c8e98cce7a6a4433f2b56b526a0ed1e57237b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 4 Jul 2025 15:56:52 +0200 Subject: [PATCH] avcodec/av1dec,libdav1d,wbmpdec: Avoid direct access to GetByteContext Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 2 +- libavcodec/libdav1d.c | 2 +- libavcodec/wbmpdec.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 3d4363cfaa..b0c4efab8a 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1019,7 +1019,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (provider_oriented_code != 0x800) return 0; // ignore - ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, gb.buffer_end - gb.buffer, + ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, bytestream2_get_bytes_left(&gb), avctx->err_recognition); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index a1158a23c4..bd3050b881 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -444,7 +444,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (provider_oriented_code != 0x800) return 0; // ignore - res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer, + res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, bytestream2_get_bytes_left(&gb), c->err_recognition); if (res < 0) { av_log(c, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); diff --git a/libavcodec/wbmpdec.c b/libavcodec/wbmpdec.c index 50c729047d..5a61510a88 100644 --- a/libavcodec/wbmpdec.c +++ b/libavcodec/wbmpdec.c @@ -72,7 +72,8 @@ static int wbmp_decode_frame(AVCodecContext *avctx, AVFrame *p, if (p->linesize[0] == (width + 7) / 8) bytestream2_get_buffer(&gb, p->data[0], height * ((width + 7) / 8)); else - readbits(p->data[0], width, height, p->linesize[0], gb.buffer, gb.buffer_end - gb.buffer); + readbits(p->data[0], width, height, p->linesize[0], + gb.buffer, bytestream2_get_bytes_left(&gb)); *got_frame = 1;