From 52d4fb2a3dd7aea62a06cf8358dc41fdb4913f6f Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Tue, 11 Oct 2011 13:25:27 -0400
Subject: apedec: set s->currentframeblocks after validating nblocks

---
 libavcodec/apedec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'libavcodec/apedec.c')

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index f6ec47039d..9274b231ce 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -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));
-- 
cgit v1.2.3