diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-01-20 05:10:32 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-01-20 14:06:52 +0100 |
| commit | 01050448cfbc0ba5a3dc83138c44848692be7f9c (patch) | |
| tree | c276fe78189774a8302106e925d3d65fd7a0e1b2 | |
| parent | 8d0631c8fa890a1a01c7289c0bf8b2ff44fe5b9c (diff) | |
| download | ffmpeg-01050448cfbc0ba5a3dc83138c44848692be7f9c.tar.gz | |
get_bits: change the failure condition in init_get_bits
Too much code relies in having init_get_bits fed with a valid
buffer and set its dimension to 0.
Check for NULL buffer instead.
(cherry picked from commit 4603ec85ed620e585fc6e2e072c99858ed421855)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/get_bits.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 12770a29a0..ffa065600b 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -375,7 +375,7 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, int buffer_size; int ret = 0; - if (bit_size > INT_MAX - 7 || bit_size <= 0) { + if (bit_size > INT_MAX - 7 || bit_size < 0 || !buffer) { buffer_size = bit_size = 0; buffer = NULL; ret = AVERROR_INVALIDDATA; |