Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
int x = get_bits(gbit, 7);
int l = get_bitsz(gbit, b * 8) + 1;
- for (k = 0; k < l; k++)
- if (j + k < max)
- s->len[i][j + k] = x;
+ k = j + l;
+ if (k > max) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid Huffman codes\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ for (; j < k; j++)
+ s->len[i][j] = x;
- j += l;
if (j == max) {
j = 0;
if (s->huff_build(&s->vlc[i], s->len[i])) {
if (i == s->planes) {
break;
}
- } else if (j > max) {
- av_log(avctx, AV_LOG_ERROR, "Invalid Huffman codes\n");
- return AVERROR_INVALIDDATA;
}
}