Browse Source

apedec: set s->currentframeblocks after validating nblocks

tags/n0.9
Justin Ruggles 14 years ago
parent
commit
52d4fb2a3d
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/apedec.c

+ 1
- 2
libavcodec/apedec.c View File

@@ -841,13 +841,12 @@ static int ape_decode_frame(AVCodecContext *avctx,
} }
s->ptr += n; s->ptr += n;


s->currentframeblocks = nblocks;
buf += 4; buf += 4;
if (!nblocks || nblocks > INT_MAX) { if (!nblocks || nblocks > INT_MAX) {
av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks); av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->samples = nblocks;
s->currentframeblocks = s->samples = nblocks;


memset(s->decoded0, 0, sizeof(s->decoded0)); memset(s->decoded0, 0, sizeof(s->decoded0));
memset(s->decoded1, 0, sizeof(s->decoded1)); memset(s->decoded1, 0, sizeof(s->decoded1));


Loading…
Cancel
Save