From patchwork Tue Feb 13 23:32:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7588 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp104732jai; Tue, 13 Feb 2018 15:32:52 -0800 (PST) X-Google-Smtp-Source: AH8x224ZIwi12AA2VFNcysYQ1npQcepVjlGQ7N8uoOvEg2YtIA146coIRbanPSZR6jVvYVYAbyIj X-Received: by 10.223.179.209 with SMTP id x17mr2600117wrd.162.1518564772289; Tue, 13 Feb 2018 15:32:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518564772; cv=none; d=google.com; s=arc-20160816; b=Tke1ZYIG82aHFeokbgKW3TWxBSxg5lBCijelOIgBONnVswsIAthkFv+bnluqF6rTO1 pZcGueE80GpBlMuZWQt8GKNGcHvymkQGVms66KeVzTUfYRjiso4TprxK6CTDDrid1+8H M8qTnbsmZEPd+VcwSnK+Vkm7vXawyyQVzBn7i6vBOnaENO4rforOyHOlPpatUOr+oJgq ppLs3ZaHB6Ubm7vGFQjSD75t5uDNR5iMWHGSLO+UioWqWfVBCt+Lv6vaVXy9yW7w2jJy FHsxw0xohiqnYfTBeu7jtrlSriWtSWfMG6epp2IMPBh7yfh/0HtLqy6Qs9q7a9eFiDzQ W4xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=RF3UOSJYqbe7F0SqpgRaiYvMrkqxkhM5CAkBAt6YQqs=; b=NR24TDC+IDUZ01wlpx5MA2IxO2msFq4auTf4TAJNaqfa17vlv2GAKLviia69M0LXi3 yUchxyXZcqE/s+a5jrj2OYf5SSypvP42dA4iIShIaxWTIJrd4nhsH7V/k77IP0X2xOtg Bf17Qx7Xlt6DUMH0mtFj9HowSNuPKz2Wzc+sLZdpQT2IwMblaTzwyWkKoaXTBlqlLRBL znvxbuitlifhacRIaqv2pDmw/X1ye+tF7MWZCrBhy8XseJYHBdvZQ02J1y8QVyKpD0Mw a3m1O6IWYMCIchUC2w4HWr6uA7rMmn0qvdFxRIK8By69LULaKF1xqJ2hgbK6h1mLjpjJ Vliw== 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 187si1362726wmo.38.2018.02.13.15.32.51; Tue, 13 Feb 2018 15:32:52 -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 B8E9C68999E; Wed, 14 Feb 2018 01:32:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-3.mx.upcmail.net (vie01a-qmta-pe02-3.mx.upcmail.net [62.179.121.183]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9F04689A84 for ; Wed, 14 Feb 2018 01:32:31 +0200 (EET) Received: from [172.31.218.49] (helo=vie01a-dmta-pe07-1.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1elk42-0006Uw-Pn for ffmpeg-devel@ffmpeg.org; Wed, 14 Feb 2018 00:32:42 +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 1elk3x-0006vC-8p for ffmpeg-devel@ffmpeg.org; Wed, 14 Feb 2018 00:32:37 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id APYW1x01x0S5wYM01PYX3e; Wed, 14 Feb 2018 00:32:32 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 14 Feb 2018 00:32:30 +0100 Message-Id: <20180213233230.11455-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_cabac: Tighten allowed coeff_abs range 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" Fixes: integer overflows Reported-by: "Xiaohan Wang (王消寒)" Based on limits in "8.5 Transform coefficient decoding process and picture construction process prior to deblocking filter process" --- libavcodec/h264_cabac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index ec5fc74b9b..815149a501 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1735,7 +1735,7 @@ decode_cabac_residual_internal(const H264Context *h, H264SliceContext *sl, \ if( coeff_abs >= 15 ) { \ int j = 0; \ - while (get_cabac_bypass(CC) && j < 30) { \ + while (get_cabac_bypass(CC) && j < 16+7) { \ j++; \ } \ \