comparison wavpack.c @ 4690:1bfdcac74275 libavcodec

Correctly handle data_size on decoding

4689:c7828f1ae244

    int samplecount;
    int got_terms = 0, got_weights = 0, got_samples = 0, got_entropy = 0, got_bs = 0;
    uint8_t* buf_end = buf + buf_size;
    int i, j, id, size, ssize, weights, t;

    if (buf_size == 0) return 0;

    memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));

    s->samples = AV_RL32(buf); buf += 4;
    if(!s->samples) return buf_size;
    /* should not happen but who knows */
    if(s->samples * 2 * avctx->channels > AVCODEC_MAX_AUDIO_FRAME_SIZE){
        av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
        return -1;
    }
    s->joint = AV_RL32(buf) & WV_JOINT; buf += 4;
    s->CRC = AV_RL32(buf); buf += 4;

4690:1bfdcac74275

    int samplecount;
    int got_terms = 0, got_weights = 0, got_samples = 0, got_entropy = 0, got_bs = 0;
    uint8_t* buf_end = buf + buf_size;
    int i, j, id, size, ssize, weights, t;

    if (buf_size == 0){
        *data_size = 0;
        return 0;
    }

    memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));

    s->samples = AV_RL32(buf); buf += 4;
    if(!s->samples){
        *data_size = 0;
        return buf_size;
    }
    /* should not happen but who knows */
    if(s->samples * 2 * avctx->channels > *data_size){
        av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
        return -1;
    }
    s->joint = AV_RL32(buf) & WV_JOINT; buf += 4;
    s->CRC = AV_RL32(buf); buf += 4;