diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 19:22:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 01:00:01 +0100 |
| commit | db0f7f7394e1f994ed38db043f78ed0f10bde0da (patch) | |
| tree | 0889518e23eb4ee8a9f81d5ccce0f9746317be08 /libavcodec | |
| parent | b666debffec1fcbb19ef377635a53b9a58bca8a4 (diff) | |
| download | ffmpeg-db0f7f7394e1f994ed38db043f78ed0f10bde0da.tar.gz | |
huffyuvdec: Skip len==0 cases
Fixes vlc decoding for hypothetical files that would contain such cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0dfc01c2bbf4b71bb56201bc4a393321e15d1b31)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/huffyuv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 993e524799..72ed3515bb 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -267,11 +267,11 @@ static void generate_joint_tables(HYuvContext *s) for (i = y = 0; y < 256; y++) { int len0 = s->len[0][y]; int limit = VLC_BITS - len0; - if(limit <= 0) + if(limit <= 0 || !len0) continue; for (u = 0; u < 256; u++) { int len1 = s->len[p][u]; - if (len1 > limit) + if (len1 > limit || !len1) continue; av_assert0(i < (1 << VLC_BITS)); len[i] = len0 + len1; @@ -296,17 +296,17 @@ static void generate_joint_tables(HYuvContext *s) for (i = 0, g = -16; g < 16; g++) { int len0 = s->len[p0][g & 255]; int limit0 = VLC_BITS - len0; - if (limit0 < 2) + if (limit0 < 2 || !len0) continue; for (b = -16; b < 16; b++) { int len1 = s->len[p1][b & 255]; int limit1 = limit0 - len1; - if (limit1 < 1) + if (limit1 < 1 || !len1) continue; code = (s->bits[p0][g & 255] << len1) + s->bits[p1][b & 255]; for (r = -16; r < 16; r++) { int len2 = s->len[2][r & 255]; - if (len2 > limit1) + if (len2 > limit1 || !len2) continue; av_assert0(i < (1 << VLC_BITS)); len[i] = len0 + len1 + len2; |