Fixes: CID1047223
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/flashsv.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 0982161d49..d8943d9cf8 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -149,7 +149,9 @@ static int flashsv2_prime(FlashSVContext *s, const uint8_t
*src, int size)
zstream->avail_in = size;
zstream->next_out = data;
zstream->avail_out = s->block_size * 3;
- inflate(zstream, Z_SYNC_FLUSH);
+ zret = inflate(zstream, Z_SYNC_FLUSH);
+ if (zret != Z_OK && zret != Z_STREAM_END)
+ return AVERROR_UNKNOWN;
remaining = s->block_size * 3 - zstream->avail_out;
if ((zret = inflateReset(zstream)) != Z_OK) {
@@ -165,7 +167,9 @@ static int flashsv2_prime(FlashSVContext *s, const uint8_t
*src, int size)
* out of the output from above. See section 3.2.4 of RFC 1951. */
zstream->next_in = zlib_header;
zstream->avail_in = sizeof(zlib_header);
- inflate(zstream, Z_SYNC_FLUSH);
+ zret = inflate(zstream, Z_SYNC_FLUSH);
+ if (zret != Z_OK)
+ return AVERROR_UNKNOWN;
while (remaining > 0) {
unsigned block_size = FFMIN(UINT16_MAX, remaining);
uint8_t header[5];
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
