Module: libav
Branch: master
Commit: 4603ec85ed620e585fc6e2e072c99858ed421855

Author:    Luca Barbato <[email protected]>
Committer: Luca Barbato <[email protected]>
Date:      Sun Jan 20 05:10:32 2013 +0100

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.

---

 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 12770a2..ffa0656 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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to