apedec: set s->currentframeblocks after validating nblocks
authorJustin Ruggles <justin.ruggles@gmail.com>
Tue, 11 Oct 2011 17:25:27 +0000 (13:25 -0400)
committerJustin Ruggles <justin.ruggles@gmail.com>
Fri, 28 Oct 2011 15:47:28 +0000 (11:47 -0400)
libavcodec/apedec.c

index f6ec470..9274b23 100644 (file)
@@ -841,13 +841,12 @@ static int ape_decode_frame(AVCodecContext *avctx,
         }
         s->ptr += n;
 
-        s->currentframeblocks = nblocks;
         buf += 4;
         if (!nblocks || nblocks > INT_MAX) {
             av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks);
             return AVERROR_INVALIDDATA;
         }
-        s->samples = nblocks;
+        s->currentframeblocks = s->samples = nblocks;
 
         memset(s->decoded0,  0, sizeof(s->decoded0));
         memset(s->decoded1,  0, sizeof(s->decoded1));