This prevents a division by zero in read_packet.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
libavformat/filmstripdec.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c
index 414e276..0aeb594 100644
--- a/libavformat/filmstripdec.c
+++ b/libavformat/filmstripdec.c
@@ -25,6 +25,7 @@
*/
#include "libavutil/intreadwrite.h"
+#include "libavutil/imgutils.h"
#include "avformat.h"
#include "internal.h"
@@ -68,10 +69,8 @@ static int read_header(AVFormatContext *s)
st->codecpar->height = avio_rb16(pb);
film->leading = avio_rb16(pb);
- if (st->codecpar->width * 4LL * st->codecpar->height >= INT_MAX) {
- av_log(s, AV_LOG_ERROR, "dimensions too large\n");
- return AVERROR_PATCHWELCOME;
- }
+ if (av_image_check_size(st->codecpar->width, st->codecpar->height, 0, s) <
0)
+ return AVERROR_INVALIDDATA;
avpriv_set_pts_info(st, 64, 1, avio_rb16(pb));
--
2.10.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
