From patchwork Mon Jul 24 15:34:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4440 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp4385350vsb; Mon, 24 Jul 2017 08:34:45 -0700 (PDT) X-Received: by 10.28.138.194 with SMTP id m185mr998047wmd.116.1500910485550; Mon, 24 Jul 2017 08:34:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500910485; cv=none; d=google.com; s=arc-20160816; b=uPNzuvbwd+YUGD7Np50r/eKoc30zaFePME0RaXK/BF7GmJgsaMJ/ExhT+DyAyerkn8 /+Awt89yx4vFOQyhERsm0hHGWYgUnbVTP85TOobj63WJCRgZXOAW+v8GZp0N9R+wn1Pd q1Bjr63A+jnzT4Ikdfex5dKYVLrXcZvj5iGppRPzC5KhhiCa3zuuNFAKiTfVra6S0s9h 7NkOdPNB/9aamncpfRRHV7s4lTkUVT46LlkB7XyKCQSWvVOjVIcx/klYWS5NSOwc0Dvu W8ZlRNieQFJ8AHfgBJLIuFrQZmsulJ9zH3qIndFIQExNRPNYe9sGlflWokdNIKPjFxfI 4I0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=CyABCl09IvM7O0PJgruunMAhSq2TsJ9n0eKYfXd1eC4=; b=tMgYY6w/wrNDVKS0Ym+xL2DKIyJgTRjXo3dtuFka/340bpf0Df75YZRiEX3KvkL2j+ 7jj4CmnGcTTH837t4Pm1rJcc32/p3tcJrr+ywZT/ywvK/4UXjdjF8C4Zd3OV92kY76rM IjQOp2y3V/PFJKIkafGR3FkM9wBbUMA1muuDi9uZm+49ICeYBnHwOTJIz4/+gBq1Htty ZAdw2HlBju0azBiS5Zk7LOAIJfQdDFuSLzqlTK6xgiDD3mboQMNbp6GgXek19IFMvyZr jmoEqfaKG2cFAPQdkr5IVT1K0XQoS6Eh0fIyuCNJq8TQTNYzn6+FHynxNzUwoGWBYLFc EOUA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k23si9647560wrk.451.2017.07.24.08.34.44; Mon, 24 Jul 2017 08:34:45 -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 DB01D689AD7; Mon, 24 Jul 2017 18:34:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F138688395 for ; Mon, 24 Jul 2017 18:34:25 +0300 (EEST) Received: from [172.31.218.52] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dZfNS-0008HU-5H for ffmpeg-devel@ffmpeg.org; Mon, 24 Jul 2017 17:34:34 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dZfNL-0002OA-Tr for ffmpeg-devel@ffmpeg.org; Mon, 24 Jul 2017 17:34:27 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id ofaS1v01Z0S5wYM01faTnU; Mon, 24 Jul 2017 17:34:27 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jul 2017 17:34:25 +0200 Message-Id: <20170724153425.21586-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170724153425.21586-1-michael@niedermayer.cc> References: <20170724153425.21586-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/jpeg2000dec: Fix division by zero in jp2_find_codestream() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: 2707/clusterfuzz-testcase-minimized-5179636394754048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index b67efc76bb..dd9c60feb4 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2075,6 +2075,11 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) hden = bytestream2_get_be16u(&s->g); vexp = bytestream2_get_byteu(&s->g); hexp = bytestream2_get_byteu(&s->g); + if (!vnum || !vden || !hnum || !vden) { + bytestream2_seek(&s->g, atom2_end, SEEK_SET); + av_log(s->avctx, AV_LOG_WARNING, "RES box invalid\n"); + continue; + } if (vexp > hexp) { vexp -= hexp; hexp = 0;