From: Michael Niedermayer <[email protected]>
---
libavcodec/sgidec.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index bf717b0..1145afb 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -48,13 +48,14 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
{
unsigned char pixel, count;
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)
return AVERROR_INVALIDDATA;
pixel = bytestream2_get_byteu(&s->g);
if (!(count = (pixel & 0x7f))) {
- return (out_buf - orig) / pixelstride;
+ break;
}
/* Check for buffer overflow. */
@@ -77,6 +78,7 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
}
}
}
+ return (out_buf - orig) / pixelstride;
}
/**
--
1.8.3.4 (Apple Git-47)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
