diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 12:46:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 12:49:52 +0200 |
| commit | 676d380f2adda2fdd5170e89b95bb9a112c3d18f (patch) | |
| tree | c9625e7da96de3188f40bf132fb60c4a46caa21b | |
| parent | 7ac167493e5404fd2d3f307d02127f23fca970f0 (diff) | |
| download | ffmpeg-676d380f2adda2fdd5170e89b95bb9a112c3d18f.tar.gz | |
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>
| -rw-r--r-- | libavcodec/bitstream.c | 6 | ||||
| -rw-r--r-- | libavcodec/ffv1.c | 2 |
2 files changed, 5 insertions, 3 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) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 7d1492ff46..b00b463e16 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -40,7 +40,7 @@ #define MAX_QUANT_TABLES 8 #define MAX_CONTEXT_INPUTS 5 -extern const uint8_t ff_log2_run[32]; +extern const uint8_t ff_log2_run[41]; static const int8_t quant3[256]={ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |