From patchwork Sun Jan 1 13:22:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2008 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp3596902vsb; Sun, 1 Jan 2017 05:22:35 -0800 (PST) X-Received: by 10.194.109.42 with SMTP id hp10mr46583292wjb.167.1483276955703; Sun, 01 Jan 2017 05:22:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c63si65880335wmf.97.2017.01.01.05.22.35; Sun, 01 Jan 2017 05:22:35 -0800 (PST) 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 03E956897C1; Sun, 1 Jan 2017 15:22:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DDBE680C5C for ; Sun, 1 Jan 2017 15:22:22 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cNg5h-0005jn-8n for ffmpeg-devel@ffmpeg.org; Sun, 01 Jan 2017 14:22:25 +0100 Received: from [192.168.1.3] ([80.110.108.6]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id T1NP1u01f08Jvx4011NRWs; Sun, 01 Jan 2017 14:22:25 +0100 X-SourceIP: 80.110.108.6 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Sun, 1 Jan 2017 14:22:23 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701011422.23859.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/mjpegdec: Do not overread too short JFIF tag 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 #6055 for me. Please comment, Carl Eugen From 3a9e911de8c5a4cf7748fa814e66b2e775778bfa Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 1 Jan 2017 14:19:48 +0100 Subject: [PATCH] lavc/mjpegdec: Do not overread too short JFIF tags. Fixes ticket #6055. --- libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index eee8d58..e0b22ec 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1670,6 +1670,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) if (id == AV_RB32("JFIF")) { int t_w, t_h, v1, v2; + if (len < 8) + goto out; skip_bits(&s->gb, 8); /* the trailing zero-byte */ v1 = get_bits(&s->gb, 8); v2 = get_bits(&s->gb, 8);