OSDN Git Service

Fixed invalid writes in wavpack decoder on corrupted bitstreams.
authorLaurent Aimar <fenrir@videolan.org>
Wed, 7 Sep 2011 20:17:39 +0000 (22:17 +0200)
committerMartin Storsjö <martin@martin.st>
Thu, 8 Sep 2011 09:00:13 +0000 (12:00 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/wavpack.c

index fccafa8..41a1176 100644 (file)
@@ -1114,7 +1114,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
             int16_t *dst = (int16_t*)samples + 1;
             int16_t *src = (int16_t*)samples;
             int cnt = samplecount;
-            while(cnt--){
+            while(cnt-- > 0){
                 *dst = *src;
                 src += channel_stride;
                 dst += channel_stride;
@@ -1123,7 +1123,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
             int32_t *dst = (int32_t*)samples + 1;
             int32_t *src = (int32_t*)samples;
             int cnt = samplecount;
-            while(cnt--){
+            while(cnt-- > 0){
                 *dst = *src;
                 src += channel_stride;
                 dst += channel_stride;
@@ -1132,7 +1132,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
             float *dst = (float*)samples + 1;
             float *src = (float*)samples;
             int cnt = samplecount;
-            while(cnt--){
+            while(cnt-- > 0){
                 *dst = *src;
                 src += channel_stride;
                 dst += channel_stride;