Commit 68def00a authored by Michael Niedermayer's avatar Michael Niedermayer

rv34: check image size before using it

fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7845f8d2
......@@ -24,6 +24,7 @@
* RV30/40 decoder common data
*/
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "avcodec.h"
......@@ -1661,6 +1662,9 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
av_log(s->avctx, AV_LOG_WARNING, "Changing dimensions to %dx%d\n",
si.width, si.height);
if (av_image_check_size(si.width, si.height, 0, s->avctx))
return AVERROR_INVALIDDATA;
s->width = si.width;
s->height = si.height;
avcodec_set_dimensions(s->avctx, s->width, s->height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment