virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/sunrast: Use ptrdiff_t for stride

Browse Source 
Fixes segfaults with negative linesizes; in particular,
this affected the sunraster-(1|8|24)bit-(raw|rle) and
sunraster-8bit_gray-raw FATE tests.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-29 13:18:54 +02:00
parent 8a9eac7e42
commit 02c19dfb85
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/sunrast.c
View File

@ -31,7 +31,8 @@ static int sunrast_decode_frame(AVCodecContext *avctx, AVFrame *p,
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
const uint8_t *buf_end = avpkt->data + avpkt->size; const uint8_t *buf_end = avpkt->data + avpkt->size;
unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen; unsigned int w, h, depth, type, maptype, maplength, x, y, len, alen;
ptrdiff_t stride;
uint8_t *ptr, *ptr2 = NULL; uint8_t *ptr, *ptr2 = NULL;
const uint8_t *bufstart = buf; const uint8_t *bufstart = buf;
int ret; int ret;
@ -141,7 +142,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, AVFrame *p,
if (type == RT_BYTE_ENCODED) { if (type == RT_BYTE_ENCODED) {
int value, run; int value, run;
uint8_t *end = ptr + h * stride; uint8_t *end = ptr + (ptrdiff_t)h * stride;
x = 0; x = 0;
while (ptr != end && buf < buf_end) { while (ptr != end && buf < buf_end) {