summaryrefslogtreecommitdiff
path: root/libavcodec/bitstream.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-01 12:46:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-01 12:49:52 +0200
commit676d380f2adda2fdd5170e89b95bb9a112c3d18f (patch)
treec9625e7da96de3188f40bf132fb60c4a46caa21b /libavcodec/bitstream.c
parent7ac167493e5404fd2d3f307d02127f23fca970f0 (diff)
Fix undefined behavior in ffv1 with insane widths.
The new tables is large enough to prevent this together with our image size checks. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bitstream.c')
-rw-r--r--libavcodec/bitstream.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 83f30f9799..8fd44e3d78 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -32,11 +32,13 @@
#include "get_bits.h"
#include "put_bits.h"
-const uint8_t ff_log2_run[32]={
+const uint8_t ff_log2_run[41]={
0, 0, 0, 0, 1, 1, 1, 1,
2, 2, 2, 2, 3, 3, 3, 3,
4, 4, 5, 5, 6, 6, 7, 7,
- 8, 9,10,11,12,13,14,15
+ 8, 9,10,11,12,13,14,15,
+16,17,18,19,20,21,22,23,
+24,
};
void align_put_bits(PutBitContext *s)