From patchwork Mon Dec 24 00:14:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 11532 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C048444C734 for ; Mon, 24 Dec 2018 02:16:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 716EA68ABC0; Mon, 24 Dec 2018 02:16:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-1.mx.upcmail.net (vie01a-dmta-pe07-1.mx.upcmail.net [84.116.36.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FB2C68A844 for ; Mon, 24 Dec 2018 02:16:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gbDuq-0006Vc-0w for ffmpeg-devel@ffmpeg.org; Mon, 24 Dec 2018 01:16:16 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id bDtrgCCrp2WSsbDtrgv97e; Mon, 24 Dec 2018 01:15:16 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E7kcWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=X_5bnIv97Oih2p2845EA:9 a=pHzHmUro8NiASowvMSCR:22 a=nt3jZW36AmriUCFCBwmW:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Dec 2018 01:14:51 +0100 Message-Id: <20181224001451.8853-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181224001451.8853-1-michael@niedermayer.cc> References: <20181224001451.8853-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfD1tCwcCaZY6TT96vrJyYXfh3+rxjgpw2yNoBcK1jdcRTFcswlIFYDvuVypIPEWcWVwT0gKkiiRsceaXLlBi4B6WP1Y5jWwcMweSQBTvTLu10f6M+cMW XNcfUcHWu9WBivoKnlrsfPbWnv0br7/fHBKbK0ZIF8yjWY8eBb1p6412 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/utils: Optimize ff_color_frame() 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: Timeout Fixes: 10709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5630617975259136 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d519b16092..5f8bec6df4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -423,8 +423,13 @@ void ff_color_frame(AVFrame *frame, const int c[4]) int height = is_chroma ? AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height; for (y = 0; y < height; y++) { if (desc->comp[0].depth >= 9) { - for (x = 0; xlinesize[p];