git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e16ad2
)
avcodec/ivi: Check image dimensions
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 14 Nov 2015 01:36:22 +0000
(
02:36
+0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 14 Nov 2015 01:37:12 +0000
(
02:37
+0100)
Fixes integer overflow
Fixes:
1e32c6c591d940337c20b197ec1c4d3d
/asan_heap-oob_4a52e5_8946_0bb0d9e863def56005e49f1d89bdc94d.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/ivi.c
patch
|
blob
|
history
diff --git
a/libavcodec/ivi.c
b/libavcodec/ivi.c
index
4525ff4
..
eab42bb
100644
(file)
--- a/
libavcodec/ivi.c
+++ b/
libavcodec/ivi.c
@@
-30,6
+30,7
@@
#define BITSTREAM_READER_LE
#include "libavutil/attributes.h"
+#include "libavutil/imgutils.h"
#include "libavutil/timer.h"
#include "avcodec.h"
#include "get_bits.h"
@@
-310,7
+311,7
@@
av_cold int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg,
ivi_free_buffers(planes);
- if (
cfg->pic_width < 1 || cfg->pic_height < 1
||
+ if (
av_image_check_size(cfg->pic_width, cfg->pic_height, 0, NULL) < 0
||
cfg->luma_bands < 1 || cfg->chroma_bands < 1)
return AVERROR_INVALIDDATA;