From 2c566744c41e075ac4b882137105e73b2c1a6870 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Mar 2014 05:13:05 +0100 Subject: [PATCH] avcodec/vorbis: fix decoding of single element huffman trees Fixes Ticket2893 Signed-off-by: Michael Niedermayer (cherry picked from commit 742d8601031fc69748f62fe7c5164a22a0751021) Signed-off-by: Michael Niedermayer --- libavcodec/vorbis.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 6eb765d7d0..05f18b474d 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -85,6 +85,11 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) ++p; + for (i = p; (bits[i] == 0) && (i < num); ++i) + ; + if (i == num) + return 0; + for (; p < num; ++p) { if (bits[p] > 32) return 1;