Commit ae6fd730 authored by Andreas Cadhalpun's avatar Andreas Cadhalpun Committed by Michael Niedermayer

msrledec: use signed pixel_ptr in msrle_decode_pal4

This fixes segmentation faults, when pic->linesize[0] is negative.
In that case 'line * pic->linesize[0] + pixel_ptr' is treated as
unsigned and wraps around.

This reverts commit 7d78a964.
The problem was introduced in commit f7e1367f, which should obsolete
that commit.
Signed-off-by: 's avatarAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ed2a7127
...@@ -36,7 +36,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, ...@@ -36,7 +36,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
unsigned char rle_code; unsigned char rle_code;
unsigned char extra_byte, odd_pixel; unsigned char extra_byte, odd_pixel;
unsigned char stream_byte; unsigned char stream_byte;
unsigned int pixel_ptr = 0; int pixel_ptr = 0;
int line = avctx->height - 1; int line = avctx->height - 1;
int i; int i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment