[FFmpeg-devel] [PATCH 4/4] avcodec/get_bits: Remove GetBitContext.buffer_end
Andreas Rheinhardt
ffmpegagent at gmail.com
Fri Jul 4 16:44:57 EEST 2025
From: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
It is unused. Furthermore, this automatically fixes the issue
that init_get_bits() failure would lead to NULL + 0 (when
setting buffer_end) which is UB before C23. This happened
in the fic-avi and fic-avi-skip_cursor FATE-tests.
This saved 7296B of .text here.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
libavcodec/get_bits.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index c64540cf95..80a77f0ae3 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -107,7 +107,7 @@ typedef BitstreamContext GetBitContext;
#else // CACHED_BITSTREAM_READER
typedef struct GetBitContext {
- const uint8_t *buffer, *buffer_end;
+ const uint8_t *buffer;
int index;
int size_in_bits;
int size_in_bits_plus8;
@@ -512,7 +512,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
int bit_size)
{
- int buffer_size;
int ret = 0;
if (bit_size >= INT_MAX - FFMAX(7, AV_INPUT_BUFFER_PADDING_SIZE*8) || bit_size < 0 || !buffer) {
@@ -521,12 +520,9 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
ret = AVERROR_INVALIDDATA;
}
- buffer_size = (bit_size + 7) >> 3;
-
s->buffer = buffer;
s->size_in_bits = bit_size;
s->size_in_bits_plus8 = bit_size + 8;
- s->buffer_end = buffer + buffer_size;
s->index = 0;
return ret;
--
ffmpeg-codebot
More information about the ffmpeg-devel
mailing list