The function can fail internally and using the returned context results in segfaults.
CC: [email protected] --- libavcodec/get_bits.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index c56a2c2..dc67c52 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -362,18 +362,22 @@ static inline int check_marker(GetBitContext *s, const char *msg) } /** - * Inititalize GetBitContext. - * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits - * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end + * Initialize GetBitContext. + * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes + * larger than the actual read bits because some optimized bitstream + * readers read 32 or 64 bit at once and could read over the end * @param bit_size the size of the buffer in bits + * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size overflows. */ -static inline void 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 buffer_size = (bit_size+7)>>3; + int ret = 0; if (buffer_size < 0 || bit_size < 0) { buffer_size = bit_size = 0; buffer = NULL; + ret = AVERROR_INVALIDDATA; } s->buffer = buffer; @@ -383,6 +387,7 @@ static inline void init_get_bits(GetBitContext *s, const uint8_t *buffer, #endif s->buffer_end = buffer + buffer_size; s->index = 0; + return ret; } static inline void align_get_bits(GetBitContext *s) -- 1.8.0.2 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
