generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sgi: fix end of line boundary detection

Browse Source
This commit is contained in:
Michael Niedermayer 2012-08-12 05:32:07 +02:00 committed by Vittorio Giovara
parent e7cd53bf66
commit 0279d1d094
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/sgidec.c
View File

@ -48,13 +48,14 @@ 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;
uint8_t *out_end = out_buf + len;
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. */
@ -77,6 +78,7 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
} }
} }
} }
return (out_buf - orig) / pixelstride;
} }
/** /**