From 58825a18aacca2e703e969cb064113dbb0e04b07 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 11 Aug 2012 02:20:06 +0200
Subject: [PATCH] msrle: fix regression causing null ptr dereference
Fixes Ticket1630
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/msrle.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 2a9d95ad70a..7c965d25e2a 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -106,11 +106,10 @@ static int msrle_decode_frame(AVCodecContext *avctx,
s->frame.palette_has_changed = 1;
memcpy(s->pal, pal, AVPALETTE_SIZE);
}
+ /* make the palette available */
+ memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
}
- /* make the palette available */
- memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
-
/* FIXME how to correctly detect RLE ??? */
if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;
--
GitLab