virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/get_bits: Remove GetBitContext.buffer_end

Browse Source 
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@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-07-04 14:31:13 +02:00
parent 367cf961ea
commit ba2c9acedb
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/get_bits.h
View File

@ -107,7 +107,7 @@ typedef BitstreamContext GetBitContext;
#else // CACHED_BITSTREAM_READER #else // CACHED_BITSTREAM_READER
typedef struct GetBitContext { typedef struct GetBitContext {
const uint8_t *buffer, *buffer_end; const uint8_t *buffer;
int index; int index;
int size_in_bits; int size_in_bits;
int size_in_bits_plus8; 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, static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
int bit_size) int bit_size)
{ {
int buffer_size;
int ret = 0; int ret = 0;
if (bit_size >= INT_MAX - FFMAX(7, AV_INPUT_BUFFER_PADDING_SIZE*8) || bit_size < 0 || !buffer) { 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; ret = AVERROR_INVALIDDATA;
} }
buffer_size = (bit_size + 7) >> 3;
s->buffer = buffer; s->buffer = buffer;
s->size_in_bits = bit_size; s->size_in_bits = bit_size;
s->size_in_bits_plus8 = bit_size + 8; s->size_in_bits_plus8 = bit_size + 8;
s->buffer_end = buffer + buffer_size;
s->index = 0; s->index = 0;
return ret; return ret;