diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2013-06-12 14:22:24 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-06-30 16:06:26 +0200 |
| commit | e96aaa5622ed2efeb3729f46331990d952208a17 (patch) | |
| tree | 56a7395872b70c3a89a2b3457457afb34ae6096c | |
| parent | e98f95670bf107a4307258b33e37be0abe811279 (diff) | |
| download | ffmpeg-e96aaa5622ed2efeb3729f46331990d952208a17.tar.gz | |
smacker: fix an off by one in huff.length computation
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ee205588b250fe5cae0681be8eba51a5403c3272)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/smacker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 3928d8f569..f74f0dbc54 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -252,7 +252,7 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int ctx.recode2 = tmp2.values; ctx.last = last; - huff.length = ((size + 3) >> 2) + 3; + huff.length = ((size + 3) >> 2) + 4; huff.maxlength = 0; huff.current = 0; huff.values = av_mallocz(huff.length * sizeof(int)); |