From patchwork Sun Feb 18 22:07:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7642 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp845206jai; Sun, 18 Feb 2018 14:07:44 -0800 (PST) X-Google-Smtp-Source: AH8x227RKcEFaYMCtjOZj64BsEHq0/IuHnwX25KjD+ZYM2EkfYEGOWkyyutKCX7aOl+eXwzg+q3n X-Received: by 10.223.144.198 with SMTP id i64mr11972879wri.6.1518991664852; Sun, 18 Feb 2018 14:07:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518991664; cv=none; d=google.com; s=arc-20160816; b=gEPooeQC5vP9DfhaEXVcNlJ/5gqH+GxkcMO9wLx+3+kcTuI2bM07f9KY0zLIB3cQCH NvewQl4/KLF3kfK+xAGRuSt/B2r6cpojOAHYZcdYpFw2rKuNSsx3oarHTmXG74wHzzYF tWbjtAGZVDFMeYiW60QFFKAf1qwJmV3zWUI5meGFkRnQ2ntiBItK5ImsvhNDH/9N6wbi DWfIHaudLZbmqhft2Nyw/4NuhMShMOmRIh61XsCzESHskrrG0krYLidZVzDvC2CZUp0G 9nMYIqlnXOc9uo6M3woogzVbmU/gzgfDfhjs4F1QKEck/50+m2/B3itY6e5dodQVkYPx f+6Q== 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=iBjJxwJSU01qT5xu/JLXNZ7zYzwgZIK8iNAdJp/bM80=; b=WR8WOIye9FpOgF/rdHjmKCCO6ObFt4LcCfM7oqpVI1MjMlaxBzS+OCrWZhyBCZKVnb oSxdRIs2j/B4HNbbdNuYczcOa+Wt01A50QnY6lQ75oCuBxiDyAmoE8SqO5p4H1pNwmek rgTQE6+g5O9NTtVuVox8+b4wRa17C5NAhhW21ycfD5q1KCvZeZmh7E8TUFugc4AzoiNU G4pJBNnlGzlKcAraB/WjuX+MRskGGJ4EigVyR43NYgP2Tyo/Nmgiavu1STIVP3xjQ1Rt EQbrLz4+OnwbTzpjIaR5XQlndwkAtbzHgybWOH2iXrFfPTzMtg4zmMhQh9fEU3kLWxhF YREg== 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 h44si11952629wrf.158.2018.02.18.14.07.44; Sun, 18 Feb 2018 14:07:44 -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 ED1FA689C78; Mon, 19 Feb 2018 00:07:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26B8B689757 for ; Mon, 19 Feb 2018 00:07:35 +0200 (EET) Received: from [172.31.218.50] (helo=vie01a-dmta-pe07-2.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1enX7P-0007jP-CW for ffmpeg-devel@ffmpeg.org; Sun, 18 Feb 2018 23:07:35 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1enX7J-0007P2-FG for ffmpeg-devel@ffmpeg.org; Sun, 18 Feb 2018 23:07:29 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id CN7R1x00l0S5wYM01N7SYw; Sun, 18 Feb 2018 23:07:26 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Feb 2018 23:07:22 +0100 Message-Id: <20180218220722.9397-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180218220722.9397-1-michael@niedermayer.cc> References: <20180218220722.9397-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/diracdec: Fix integer overflow in mv computation 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: signed integer overflow: -2072 + -2147483646 cannot be represented in type 'int' Fixes: 6097/clusterfuzz-testcase-minimized-5034145253163008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/diracdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index e3afbf14be..753adeff61 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1437,8 +1437,8 @@ static void decode_block_params(DiracContext *s, DiracArith arith[8], DiracBlock global_mv(s, block, x, y, i); } else { pred_mv(block, stride, x, y, i); - block->u.mv[i][0] += dirac_get_arith_int(arith + 4 + 2 * i, CTX_MV_F1, CTX_MV_DATA); - block->u.mv[i][1] += dirac_get_arith_int(arith + 5 + 2 * i, CTX_MV_F1, CTX_MV_DATA); + block->u.mv[i][0] += (unsigned)dirac_get_arith_int(arith + 4 + 2 * i, CTX_MV_F1, CTX_MV_DATA); + block->u.mv[i][1] += (unsigned)dirac_get_arith_int(arith + 5 + 2 * i, CTX_MV_F1, CTX_MV_DATA); } } }