diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 05:13:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 11:20:56 +0100 |
| commit | 2c566744c41e075ac4b882137105e73b2c1a6870 (patch) | |
| tree | f275881856fde93319e508f08d249477f31f0b5a | |
| parent | adad1ba5d86b7fa4c3d81f79e949b866d1232b1b (diff) | |
| download | ffmpeg-2c566744c41e075ac4b882137105e73b2c1a6870.tar.gz | |
avcodec/vorbis: fix decoding of single element huffman trees
Fixes Ticket2893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 742d8601031fc69748f62fe7c5164a22a0751021)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vorbis.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; |