Skip to content

F
ffmpeg.wasm-core
Commit 6fd7bf7b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

sgidec: fix error free end detection. 

Fixes Ticket1506
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 39c56ef9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libavcodec/sgidec.c
View file @ 6fd7bf7b
...@@ -49,12 +49,12 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf, ...@@ -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, ...@@ -74,6 +74,7 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
} }
} }
} }
return (out_buf - orig) / pixelstride;
} }
/** /**
......
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