Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Browse Source 
As done in msrle_decode_8_16_24_32.

Bug-Id: CVE-2015-3395
CC: libav-stable@libav.org
pull/116/merge
Luca Barbato 10 years ago
parent b2f0f37d24
commit 5ecabd3c54
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/msrledec.c

2
libavcodec/msrledec.c
Unescape View File

@ -39,7 +39,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
unsigned int pixel_ptr = 0; unsigned int pixel_ptr = 0;
int row_dec = pic->linesize[0]; int row_dec = pic->linesize[0];
int row_ptr = (avctx->height - 1) * row_dec; int row_ptr = (avctx->height - 1) * row_dec;
int frame_size = row_dec * avctx->height; int frame_size = FFABS(row_dec) * avctx->height;
int i; int i;
while (row_ptr >= 0) { while (row_ptr >= 0) {

Write Preview
Loading…
Cancel
Save