*/
typedef struct HuffContext {
int length;
- int maxlength;
int current;
uint32_t *bits;
int *lengths;
int *recode1, *recode2;
int escapes[3];
int *last;
- int lcur;
} DBCtx;
/* possible runs of blocks */
}
hc->values[hc->current] = get_bits(gb, 8);
hc->current++;
- if(hc->maxlength < length)
- hc->maxlength = length;
return 0;
} else { //Node
int r;
r = smacker_decode_tree(gb, hc, prefix, length);
if(r)
return r;
- return smacker_decode_tree(gb, hc, prefix | (1 << (length - 1)), length);
+ return smacker_decode_tree(gb, hc, prefix | (1U << (length - 1)), length);
}
}
return AVERROR_INVALIDDATA;
}
- if (hc->current + 1 >= hc->length) {
+ if (hc->current >= hc->length) {
av_log(NULL, AV_LOG_ERROR, "Tree size exceeded!\n");
return AVERROR_INVALIDDATA;
}
*/
static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int **recodes, int *last, int size)
{
- int res;
HuffContext huff;
- HuffContext tmp1, tmp2;
+ HuffContext h[2] = { 0 };
VLC vlc[2] = { { 0 } };
int escapes[3];
DBCtx ctx;
- int err = 0;
+ int err;
if(size >= UINT_MAX>>4){ // (((size + 3) >> 2) + 3) << 2 must not overflow
av_log(smk->avctx, AV_LOG_ERROR, "size too large\n");
return AVERROR_INVALIDDATA;
}
- tmp1.length = 256;
- tmp1.maxlength = 0;
- tmp1.current = 0;
- tmp1.bits = av_mallocz(256 * 4);
- tmp1.lengths = av_mallocz(256 * sizeof(int));
- tmp1.values = av_mallocz(256 * sizeof(int));
-
- tmp2.length = 256;
- tmp2.maxlength = 0;
- tmp2.current = 0;
- tmp2.bits = av_mallocz(256 * 4);
- tmp2.lengths = av_mallocz(256 * sizeof(int));
- tmp2.values = av_mallocz(256 * sizeof(int));
- if (!tmp1.bits || !tmp1.lengths || !tmp1.values ||
- !tmp2.bits || !tmp2.lengths || !tmp2.values) {
- err = AVERROR(ENOMEM);
- goto error;
- }
-
- if(get_bits1(gb)) {
- res = smacker_decode_tree(gb, &tmp1, 0, 0);
- if (res < 0) {
- err = res;
+ for (int i = 0; i < 2; i++) {
+ h[i].length = 256;
+ h[i].current = 0;
+ h[i].bits = av_malloc(256 * sizeof(h[i].bits[0]));
+ h[i].lengths = av_malloc(256 * sizeof(h[i].lengths[0]));
+ h[i].values = av_malloc(256 * sizeof(h[i].values[0]));
+ if (!h[i].bits || !h[i].lengths || !h[i].values) {
+ err = AVERROR(ENOMEM);
goto error;
}
- skip_bits1(gb);
- if(tmp1.current > 1) {
- res = init_vlc(&vlc[0], SMKTREE_BITS, tmp1.length,
- tmp1.lengths, sizeof(int), sizeof(int),
- tmp1.bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
- if(res < 0) {
- av_log(smk->avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- err = res;
- goto error;
- }
+ if (!get_bits1(gb)) {
+ h[i].values[0] = 0;
+ av_log(smk->avctx, AV_LOG_ERROR, "Skipping %s bytes tree\n",
+ i ? "high" : "low");
+ continue;
}
- }
- if (!vlc[0].table) {
- av_log(smk->avctx, AV_LOG_ERROR, "Skipping low bytes tree\n");
- }
- if(get_bits1(gb)){
- res = smacker_decode_tree(gb, &tmp2, 0, 0);
- if (res < 0) {
- err = res;
+ err = smacker_decode_tree(gb, &h[i], 0, 0);
+ if (err < 0)
goto error;
- }
skip_bits1(gb);
- if(tmp2.current > 1) {
- res = init_vlc(&vlc[1], SMKTREE_BITS, tmp2.length,
- tmp2.lengths, sizeof(int), sizeof(int),
- tmp2.bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
- if(res < 0) {
+ if (h[i].current > 1) {
+ err = init_vlc(&vlc[i], SMKTREE_BITS, h[i].current,
+ INIT_VLC_DEFAULT_SIZES(h[i].lengths),
+ INIT_VLC_DEFAULT_SIZES(h[i].bits),
+ INIT_VLC_LE);
+ if (err < 0) {
av_log(smk->avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- err = res;
goto error;
}
}
}
- if (!vlc[1].table) {
- av_log(smk->avctx, AV_LOG_ERROR, "Skipping high bytes tree\n");
- }
escapes[0] = get_bits(gb, 16);
escapes[1] = get_bits(gb, 16);
ctx.escapes[2] = escapes[2];
ctx.v1 = &vlc[0];
ctx.v2 = &vlc[1];
- ctx.recode1 = tmp1.values;
- ctx.recode2 = tmp2.values;
+ ctx.recode1 = h[0].values;
+ ctx.recode2 = h[1].values;
ctx.last = last;
- huff.length = ((size + 3) >> 2) + 4;
- huff.maxlength = 0;
+ huff.length = (size + 3) >> 2;
huff.current = 0;
- huff.values = av_mallocz_array(huff.length, sizeof(int));
+ huff.values = av_malloc_array(huff.length + 3, sizeof(huff.values[0]));
if (!huff.values) {
err = AVERROR(ENOMEM);
goto error;
}
+ *recodes = huff.values;
- res = smacker_decode_bigtree(gb, &huff, &ctx, 0);
- if (res < 0)
- err = res;
+ err = smacker_decode_bigtree(gb, &huff, &ctx, 0);
+ if (err < 0)
+ goto error;
skip_bits1(gb);
if(ctx.last[0] == -1) ctx.last[0] = huff.current++;
if(ctx.last[1] == -1) ctx.last[1] = huff.current++;
if(ctx.last[2] == -1) ctx.last[2] = huff.current++;
- if (ctx.last[0] >= huff.length ||
- ctx.last[1] >= huff.length ||
- ctx.last[2] >= huff.length) {
- av_log(smk->avctx, AV_LOG_ERROR, "Huffman codes out of range\n");
- err = AVERROR_INVALIDDATA;
- }
-
- *recodes = huff.values;
+ err = 0;
error:
- if(vlc[0].table)
- ff_free_vlc(&vlc[0]);
- if(vlc[1].table)
- ff_free_vlc(&vlc[1]);
- av_free(tmp1.bits);
- av_free(tmp1.lengths);
- av_free(tmp1.values);
- av_free(tmp2.bits);
- av_free(tmp2.lengths);
- av_free(tmp2.values);
+ for (int i = 0; i < 2; i++) {
+ if (vlc[i].table)
+ ff_free_vlc(&vlc[i]);
+ av_free(h[i].bits);
+ av_free(h[i].lengths);
+ av_free(h[i].values);
+ }
return err;
}
// Initialize
for(i = 0; i < (1 << (bits + stereo)); i++) {
h[i].length = 256;
- h[i].maxlength = 0;
h[i].current = 0;
- h[i].bits = av_mallocz(256 * 4);
- h[i].lengths = av_mallocz(256 * sizeof(int));
- h[i].values = av_mallocz(256 * sizeof(int));
+ h[i].bits = av_malloc(256 * sizeof(h[i].bits));
+ h[i].lengths = av_malloc(256 * sizeof(h[i].lengths));
+ h[i].values = av_malloc(256 * sizeof(h[i].values));
if (!h[i].bits || !h[i].lengths || !h[i].values) {
ret = AVERROR(ENOMEM);
goto error;
}
skip_bits1(&gb);
- if (smacker_decode_tree(&gb, &h[i], 0, 0) < 0) {
- ret = AVERROR_INVALIDDATA;
+ if ((ret = smacker_decode_tree(&gb, &h[i], 0, 0)) < 0)
goto error;
- }
skip_bits1(&gb);
if(h[i].current > 1) {
- res = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length,
+ ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].current,
h[i].lengths, sizeof(int), sizeof(int),
h[i].bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
- if(res < 0) {
+ if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- ret = AVERROR_INVALIDDATA;
goto error;
}
}
projects / ffmpeg / blobdiff