From patchwork Fri Jun 8 22:11:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9329 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1384905jad; Fri, 8 Jun 2018 15:12:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIg7Y5BlJVYDs4shtF5pwJeA3t1OZW9FJ6nwMr8K0UZ1Bo+w1MwLvCziPt7CyTJp4PO+e/A X-Received: by 2002:adf:c104:: with SMTP id r4-v6mr6622713wre.203.1528495935177; Fri, 08 Jun 2018 15:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528495935; cv=none; d=google.com; s=arc-20160816; b=eZVO1yv3dZjEYrqYxZjoDZ9joIw6gPMfPEF1Y/lgG9RWO5rC6aVkTA+Q7xiWQ5HhkU nhdIAqnmwhXlDnlzF2To+7aFAPcI7f/n3F5GsktWSQ6Rnt8npa4FNBsX5ObLLpkgbCeH sNBnOSlPE7lmrUdykcFTuwUyInnHNfBBgVnLVJ5hGAWlHAbOqcFLqAqlGL97BL73FR8b 14iUxbWR55kHneqjzwpR9puRzT2iAc9YkyKbhgPOjMaZCM+j2C+7tvd0Z3Bt/aKLB41y 5km3Hn2MGJfmclGryZuRWa6IajothuEEaGskyvqtiZqLSzcrStqSuAyGyCBQkE39ltH8 l7ow== 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=wzv4Qf1cHIxSeZ+IiuRmkOXAR3qqAJ/Jy8Xwujh0oEM=; b=VpY2MNzOLjebrvmit/SfEi0/xUuMzU5tZ/dq4+dn/bD3y+tHbl9SBolQ+bb9Fs5OQv FCkkHVFM2tI87UhGedkT3xCNV2wCMEMGaLBhOaR71NW5igAwL5T6bQDWqe746xVfHF5X ssF2ch4AFj/kf6Geul2YJbv1TgcpKQLYYear+vcvGRMb3zLPFR/JqDvV0g11YCS+3KSQ 3GU++jQPIe/XMLwJDdi4VSIwJgEft3Z2D465ULQy51mxiA2rljW44BCD84AOe7MgWQtW BI8bT11Fp9Miw6+Bx9hUGbaVmmFe7wbbpJ689dV+ZqQfms4k0He0qcg+46QNI9CgpBeH yVHA== 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 f8-v6si17327146wre.380.2018.06.08.15.12.14; Fri, 08 Jun 2018 15:12:15 -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 EA95D689723; Sat, 9 Jun 2018 01:11:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-3.mx.upcmail.net (vie01a-dmta-pe08-3.mx.upcmail.net [84.116.36.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3D5F680AD3 for ; Sat, 9 Jun 2018 01:11:09 +0300 (EEST) 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 1fRPbv-0007Gi-9X for ffmpeg-devel@ffmpeg.org; Sat, 09 Jun 2018 00:11:55 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id wNBu1x0080S5wYM01NBvpJ; Sat, 09 Jun 2018 00:11:55 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 9 Jun 2018 00:11:29 +0200 Message-Id: <20180608221130.12644-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608221130.12644-1-michael@niedermayer.cc> References: <20180608221130.12644-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_mc_template: Only prefetch motion if the list is used. 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: index 59 out of bounds for type 'H264Ref [48]' Fixes: 8232/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5703295145345024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_mc_template.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index 58c05044c1..d02e2bf580 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -78,7 +78,8 @@ static void MCFUNC(hl_motion)(const H264Context *h, H264SliceContext *sl, if (HAVE_THREADS && (h->avctx->active_thread_type & FF_THREAD_FRAME)) await_references(h, sl); - prefetch_motion(h, sl, 0, PIXEL_SHIFT, CHROMA_IDC); + if (USES_LIST(mb_type, 0)) + prefetch_motion(h, sl, 0, PIXEL_SHIFT, CHROMA_IDC); if (IS_16X16(mb_type)) { mc_part(h, sl, 0, 1, 16, 0, dest_y, dest_cb, dest_cr, 0, 0,