Re: [FFmpeg-devel] [PATCH 2/3] avcodec/vp8: Check bitstream input in vp7_fade_frame() before time consuming operation

2018-09-11 Thread Michael Niedermayer 
On Sun, Jun 24, 2018 at 04:46:22AM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/vp8.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply


[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are best at talking, realize last or never when they are wrong.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 2/3] avcodec/vp8: Check bitstream input in vp7_fade_frame() before time consuming operation

2018-06-23 Thread Michael Niedermayer 
Signed-off-by: Michael Niedermayer 
---
 libavcodec/vp8.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 62b9f8bc2d..f6120aa67e 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -505,6 +505,9 @@ static int vp7_fade_frame(VP8Context *s, VP56RangeCoder *c)
 int beta  = (int8_t) vp8_rac_get_uint(c, 8);
 int ret;
 
+if (c->end <= c->buffer && c->bits >= 0)
+return AVERROR_INVALIDDATA;
+
 if (!s->keyframe && (alpha || beta)) {
 int width  = s->mb_width * 16;
 int height = s->mb_height * 16;
-- 
2.18.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel