From patchwork Sun Aug 28 22:12:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 323 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1400409vsd; Sun, 28 Aug 2016 15:17:44 -0700 (PDT) X-Received: by 10.28.43.129 with SMTP id r123mr7316540wmr.1.1472422663027; Sun, 28 Aug 2016 15:17:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b73si9195762wmi.47.2016.08.28.15.17.40; Sun, 28 Aug 2016 15:17:42 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4383A689BF4; Mon, 29 Aug 2016 01:17:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B3756806CE for ; Mon, 29 Aug 2016 01:12:32 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1be8Jg-00078y-61 for ffmpeg-devel@ffmpeg.org; Mon, 29 Aug 2016 00:12:36 +0200 Received: from [192.168.1.3] ([80.110.110.176]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id cmCa1t00l3oPpmw01mCcpZ; Mon, 29 Aug 2016 00:12:36 +0200 X-SourceIP: 80.110.110.176 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 29 Aug 2016 00:12:34 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201608290012.34861.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/mjpegdec: Only read JFIF thumbnail size if the segment is long enough. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #5805. Please comment, Carl Eugen From 215d45b2226cb5681be09bb4e0a2c135925ed6f5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 29 Aug 2016 00:09:06 +0200 Subject: [PATCH] lavc/mjpegdec: Only read JFIF thumbnail size if the segment is long enough. Fixes ticket #5805. --- libavcodec/mjpegdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 633a8f0..515d2f8 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1690,6 +1690,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) s->avctx->sample_aspect_ratio.num, s->avctx->sample_aspect_ratio.den); + len -= 8; + if (len >= 2) { t_w = get_bits(&s->gb, 8); t_h = get_bits(&s->gb, 8); if (t_w && t_h) { @@ -1697,7 +1699,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) if (len -10 - (t_w * t_h * 3) > 0) len -= t_w * t_h * 3; } - len -= 10; + len -= 2; + } goto out; }