summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2014-04-06 04:01:24 +0200
committerMichael Niedermayer <[email protected]>2014-04-10 04:53:00 +0200
commitb479b42b26b9c84b596eec1c9cf46e5221752fea (patch)
tree40caa77ed931faf6e19c5ce058c78fd1c75409c5
parent36cab9c408bd6c1af8321c29f74fce8e0d110fd2 (diff)
avcodec/msrle: check return code for success before use
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 <[email protected]> (cherry picked from commit 754f84663e8b3a88fa2e953b195d59230393fb8d) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/msrle.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 750e54ae99..9f0cac61e3 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -116,6 +116,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) {