[FFmpeg-cvslog] get_bits: change the failure condition in init_get_bits
Luca Barbato
git at videolan.org
Tue Feb 5 16:27:12 CET 2013
ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Sun Jan 20 05:10:32 2013 +0100| [01050448cfbc0ba5a3dc83138c44848692be7f9c] | committer: Luca Barbato
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 at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01050448cfbc0ba5a3dc83138c44848692be7f9c
---
libavcodec/get_bits.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
More information about the ffmpeg-cvslog
mailing list