Re: [FFmpeg-devel] [PATCH] msvideo1_decode_init: check frame dimensions

2018-06-13 Thread Michael Niedermayer
On Tue, Jun 12, 2018 at 12:45:00AM +, Xiao Yang wrote:
> ---
>  libavcodec/msvideo1.c |7 +++
>  1 file changed, 7 insertions(+)

please provide a reproducabel testcase that shows the problem this fixes

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

Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data


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


[FFmpeg-devel] [PATCH] msvideo1_decode_init: check frame dimensions

2018-06-12 Thread Xiao Yang
---
 libavcodec/msvideo1.c |7 +++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 29700f5..04c5ebb 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -73,6 +73,13 @@ static av_cold int msvideo1_decode_init(AVCodecContext 
*avctx)
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 }
 
+if (!avctx->width || !avctx->height ||
+(avctx->width & 1) || (avctx->height & 1)) {
+av_log(avctx, AV_LOG_ERROR, "Invalid video dimensions: %dx%d\n",
+   avctx->width, avctx->height);
+return AVERROR(EINVAL);
+}
+
 s->frame = av_frame_alloc();
 if (!s->frame)
 return AVERROR(ENOMEM);
-- 
1.7.9.5

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