From patchwork Tue Sep 14 20:58:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30251 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp5347436iov; Tue, 14 Sep 2021 13:59:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6wJh79T/ApePB4qcbFMPfbocdt4KN9BoDmqp9qT72KSGed59bkwSyGtfzE1hHydCP1EJO X-Received: by 2002:aa7:c5d5:: with SMTP id h21mr15096621eds.233.1631653172600; Tue, 14 Sep 2021 13:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631653172; cv=none; d=google.com; s=arc-20160816; b=jie9oVkLlGtyMxNTky9HPDvOWq3b33h2KRiEej57yV3svUrbiX1JuMR277fGIVL5vg hvOJ0/x6HhEOq9IEjlaF+kZhPgA7mNnFhyapB+mOpxmzuKqFMptFY0f5muEmHZ/vkh4Z wCKE9huZGtxLGAl3s1SHRBkKt1yx0gJxIWXjP1mWPXX4Raq6DlJzmOk/l5hf1AVHZAuN mHlGZYtnlVSBfVOJCALSq9uCiYg94iCjRzWUnylqAVEtG23TPQ/g/IZZS7gnKmhkTLit S+/wtlmiOFIgh6WEkXNtijqw2ScaVmNLyZRMyrHZKPSiPayl6cRs+PFBmvzBCl/Yx6NU O1PQ== 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; bh=ZYgf7JdMCwVkoDBrtXAkJc2D242dVClbzeOFkdjxrdE=; b=0u8vmFMvplkCzEnyNLftd+POedHzIrBpqIQDzjdDJC1zQkmpcHY7iDKwOmeSHacVnT +kYsRdN0RL6K2pizuG5pV5Q3MYBUoECE03J+uKSY9EqhLPBA7MEzNsBciAKrT9DchoOz tey55PMJ57nPMuaOlUnPFX5apaggMsI6NYmnH4eZO+rWrpSPR2rYPvy0vs4JeKXZO3x6 m/VjYfkPx5FlW7sB3SHHeqGUkk4J8nrkEOGWk0qdailN1DozjCX5F3iz2QAPEaX24Rkm 5E63iS6k+Ev3T/t6Ri7GaElOR6Z1JdjRzWe074HVoWcHMWK3NFMA8e1gjZJlMTYLvKjI qk2Q== 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 l12si10782763ejo.331.2021.09.14.13.59.31; Tue, 14 Sep 2021 13:59:32 -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 4455168AF21; Tue, 14 Sep 2021 23:59:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F43B68AEDD for ; Tue, 14 Sep 2021 23:59:21 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mQFWT-002ghw-0O for ffmpeg-devel@ffmpeg.org; Tue, 14 Sep 2021 22:59:21 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id QFVVmFUOKljeHQFVVmuUJM; Tue, 14 Sep 2021 22:58:21 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=7yp53sF4scNUKLLCgVUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 14 Sep 2021 22:58:19 +0200 Message-Id: <20210914205820.12598-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210914205820.12598-1-michael@niedermayer.cc> References: <20210914205820.12598-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMhEyINBE/HfLQRuAqFdi7ZFmbHIPu76MYdXnggawPxTZq6rCLzzsEkvEZZIWopR0f4+Jdk31zLxAbhVwY4kBYeNTu3oPJNLlSXPVxpOyHxGgPFA80F/ eS3tretQ+uprB1uw0VPjewMyzkJYKcWVuXTLa6KRyZfXVwCbd7U7nsDp Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/h274: fix bad left shifts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: klE24WUpAueP Fixes: left shift of negative value -3 Fixes: 37788/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6024714540154880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h274.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h274.c b/libavcodec/h274.c index 262106733ce..20401ba06bb 100644 --- a/libavcodec/h274.c +++ b/libavcodec/h274.c @@ -250,8 +250,8 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame, // Adaptation for 4:2:0 chroma subsampling for (int i = 0; i < h274.num_intensity_intervals[c]; i++) { h274.comp_model_value[c][i][0] >>= 1; - h274.comp_model_value[c][i][1] <<= 1; - h274.comp_model_value[c][i][2] <<= 1; + h274.comp_model_value[c][i][1] *= 2; + h274.comp_model_value[c][i][2] *= 2; } }