#define SMKTREE_BITS 9
#define SMK_NODE 0x80000000
+
+ #define SMKTREE_DECODE_MAX_RECURSION 32
typedef struct SmackVContext {
AVCodecContext *avctx;
/**
* Decode local frame tree
*/
-static int smacker_decode_tree(BitstreamContext *bc, HuffContext *hc,
- uint32_t prefix, int length)
+static int smacker_decode_tree(GetBitContext *gb, HuffContext *hc, uint32_t prefix, int length)
{
- if(length > 32 || length > 3*SMKTREE_BITS) {
- av_log(NULL, AV_LOG_ERROR, "length too long\n");
- if (length > SMKTREE_DECODE_MAX_RECURSION) {
++ if (length > SMKTREE_DECODE_MAX_RECURSION || length > 3 * SMKTREE_BITS) {
+ av_log(NULL, AV_LOG_ERROR, "Maximum tree recursion level exceeded.\n");
return AVERROR_INVALIDDATA;
}
- if (!bitstream_read_bit(bc)) { // Leaf
- if(hc->current >= 256){
+
+ if(!get_bits1(gb)){ //Leaf
+ if(hc->current >= hc->length){
av_log(NULL, AV_LOG_ERROR, "Tree size exceeded!\n");
return AVERROR_INVALIDDATA;
}