diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 22:28:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 01:08:24 +0200 |
| commit | fcb8bbf26411d9abc71a9a6d74e44c81b6699983 (patch) | |
| tree | a70c39a45e77f9057218efb4c20ff64ce219e7ab | |
| parent | 38c5e8fec5625dd01b2eb77a8da8cbd791ff85b0 (diff) | |
| download | ffmpeg-fcb8bbf26411d9abc71a9a6d74e44c81b6699983.tar.gz | |
escape124: fix integer overflow leading to excessive memory allocation
Fixes Ticket1629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d7817048cb387de87600f2152075f78b37b60a6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f1e01c9915fe0c86ad2b8f50e11fee9e1b00c62)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/escape124.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index d28d55dade..f77edaf1c5 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -48,7 +48,7 @@ typedef struct Escape124Context { CodeBook codebooks[3]; } Escape124Context; -static int can_safely_read(GetBitContext* gb, int bits) { +static int can_safely_read(GetBitContext* gb, uint64_t bits) { return get_bits_left(gb) >= bits; } @@ -90,7 +90,7 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth, unsigned i, j; CodeBook cb = { 0 }; - if (!can_safely_read(gb, size * 34)) + if (!can_safely_read(gb, size * 34L)) return cb; if (size >= INT_MAX / sizeof(MacroBlock)) |