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

sgidec: fix error free end detection.

Browse Source 
Fixes Ticket1506
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-12 05:32:07 +02:00
parent 39c56ef921
commit 6fd7bf7b03
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/sgidec.c
View File

@ -49,12 +49,12 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
unsigned char pixel, count; unsigned char pixel, count;
unsigned char *orig = out_buf; unsigned char *orig = out_buf;
while (1) { while (out_buf < out_end) {
if (bytestream2_get_bytes_left(&s->g) < 1) if (bytestream2_get_bytes_left(&s->g) < 1)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
pixel = bytestream2_get_byteu(&s->g); pixel = bytestream2_get_byteu(&s->g);
if (!(count = (pixel & 0x7f))) { if (!(count = (pixel & 0x7f))) {
return (out_buf - orig) / pixelstride; break;
} }
/* Check for buffer overflow. */ /* Check for buffer overflow. */
@ -74,6 +74,7 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
} }
} }
} }
return (out_buf - orig) / pixelstride;
} }
/** /**