Commit 676d380f authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7ac16749
......@@ -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)
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment