[FFmpeg-cvslog] avcodec/jpeg2000: Use av_image_check_size() in ff_jpeg2000_init_component( )
Michael Niedermayer
git at videolan.org
Wed Nov 18 12:42:48 CET 2015
ffmpeg | branch: release/2.7 | Michael Niedermayer <michael at niedermayer.cc> | Sun Nov 15 20:03:39 2015 +0100| [d972df307aaa593e5c3f2a7a23570c63665ed601] | committer: Michael Niedermayer
avcodec/jpeg2000: Use av_image_check_size() in ff_jpeg2000_init_component()
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 016fd413f9168816924f21c0c1ffb578f7226221)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d972df307aaa593e5c3f2a7a23570c63665ed601
---
libavcodec/jpeg2000.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index 38df58d..064981f 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -28,6 +28,7 @@
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "libavutil/common.h"
+#include "libavutil/imgutils.h"
#include "libavutil/mem.h"
#include "avcodec.h"
#include "jpeg2000.h"
@@ -210,7 +211,10 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
codsty->nreslevels2decode - 1,
codsty->transform))
return ret;
- // component size comp->coord is uint16_t so ir cannot overflow
+
+ if (av_image_check_size(comp->coord[0][1] - comp->coord[0][0],
+ comp->coord[1][1] - comp->coord[1][0], 0, avctx))
+ return AVERROR_INVALIDDATA;
csize = (comp->coord[0][1] - comp->coord[0][0]) *
(comp->coord[1][1] - comp->coord[1][0]);
More information about the ffmpeg-cvslog
mailing list