avcodec/msrle: check return code for success before use
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 02:01:24 +0000 (04:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 16:16:20 +0000 (18:16 +0200)
The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash

Fixes CID1197060

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 754f84663e8b3a88fa2e953b195d59230393fb8d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/msrle.c

index a836e33..c1498b5 100644 (file)
@@ -118,6 +118,9 @@ static int msrle_decode_frame(AVCodecContext *avctx,
         uint8_t *buf = avpkt->data + (avctx->height-1)*istride;
         int i, j;
 
+        if (linesize < 0)
+            return linesize;
+
         for (i = 0; i < avctx->height; i++) {
             if (avctx->bits_per_coded_sample == 4) {
                 for (j = 0; j < avctx->width - 1; j += 2) {