diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-19 10:28:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-25 03:29:35 +0200 |
| commit | 4770eac663da306fc8298ff8b73ebeabdc23489c (patch) | |
| tree | cae9bc7e3ace4fec80ad07beefaeaaefff90016a | |
| parent | afd57722e1a8b749fc3c753824d26c2d7c0f9106 (diff) | |
| download | ffmpeg-4770eac663da306fc8298ff8b73ebeabdc23489c.tar.gz | |
avformat/swfdec: Fix inflate() error code check
Fixes infinite loop
Fixes endless.poc
Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a453bbb68f3eec202673728988bba3bc76071761)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/swfdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index fa2435e0a0..c6f5fe669e 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -119,10 +119,10 @@ retry: z->avail_out = buf_size; ret = inflate(z, Z_NO_FLUSH); - if (ret < 0) - return AVERROR(EINVAL); if (ret == Z_STREAM_END) return AVERROR_EOF; + if (ret != Z_OK) + return AVERROR(EINVAL); if (buf_size - z->avail_out == 0) goto retry; |