From patchwork Tue Feb 16 15:53:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Leconte X-Patchwork-Id: 25704 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:6d42:0:0:0:0:0 with SMTP id i63csp1394814ybc; Tue, 16 Feb 2021 07:53:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+mV7QtFKzbfjztR7KoiwE+nCgsESIXGfZ5Rzk02E7keP6sppzxtP8fxVngOnbj2o52JQQ X-Received: by 2002:a50:e613:: with SMTP id y19mr9383441edm.214.1613490807388; Tue, 16 Feb 2021 07:53:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613490807; cv=none; d=google.com; s=arc-20160816; b=KAH7fTl4jHX4EbnqJR3BUZK389vN9WN4uoNzyuMOaycMeHJAe6trDf6juIRcbhOM1w NbSBLBh/9JnpiEIjyfiSGFGEFLfQI3cU/wPY7cbpmeybjP2OT8EoskVdybYttxOusl5C yhgJpzJ8XYYovbIqbKPKjPrUJjnTDknzt4MrBA6owVLHR+2KdDwF9SCANQETO84qmvI6 c8C87WRnt3QMwMtw6lJL2cSOmxlIAkuOZHM7iXc45I+t1a3zIHlPaSz5V+6g5gJwLiEZ +IV83GNSAkVuzMAbQ62SYYnSjrqy1q1EbOMooeLpa5+rNjEbAyKTv8M/G7IjsYKI7DAB SaTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=dGEflmYBFKuICiUKss7rFeuly25ifscTbdNLElMg/wI=; b=Jg0nN+hMQy7a8rSasKfCH2khd9u3NM9BK4Rqae2/rFiiIC1Rtq4HEqbEtBF6BVScuH mVsxcRK9crkgFqKxBbG3QQdrLjBk/dLeOPAJBe3LG93ocZd+23HjbA2VLXbvzyUoJS7c iURjoZHSHJeVOnejgast8JTh2+jkRAUvx3FQ0DIYQZD0BJ3SSsCYF9GE3VCgi33omM9W /1xSq3EcZ1O0rpnCgWlsHapDacYEWzWk03fsYHJTYPCznaqQdihTaZKcM/qmyRwvMAKf al/8wPXU61A6mDvq6S1v6Ak0HOvfDWZHkmbt6fHSQtCFI3zbzWEmeEQs1E24GXy7m8zt 34Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=qEjEYuKk; 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 dc19si13676853edb.348.2021.02.16.07.53.26; Tue, 16 Feb 2021 07:53:27 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=qEjEYuKk; 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 6739F689E05; Tue, 16 Feb 2021 17:53:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 799A16881BD for ; Tue, 16 Feb 2021 17:53:14 +0200 (EET) Received: by mail-wr1-f74.google.com with SMTP id f5so13783437wro.7 for ; Tue, 16 Feb 2021 07:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=GdST28mMr6/ATrz41wdWuNGWEeE/nCYuuVnBD/XmRDo=; b=qEjEYuKk0VBLvHV+GuFgsQ54OyWjcb+qyXhZlNYbukamYd9XZc92d6Oyg4FVsOw8GM pSiiWZDrGA8wgt3r5dpxbizbbb2SGPamEhxR4cE5XDBGCC0ywSAa0uQdTQVBEaoLMOQt bR+7629VVf51hd53foXp6JJFXBQU7F0fXS1cloyYSu4R8IDHTqw8W6vxSDr03urRVB8L JzfOr7si3AZHf4fo77ne/b6wD+BIplhdAuZuHGVFsrtC9QyBVwmv5qvN4hapu89WGqeq BGiHMuHXJuerm7THENwPlG4KLOnP7fJqD1sAIjGq5t6yLawL6gt3qiXaTUntUWfm8zsp +ppw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=GdST28mMr6/ATrz41wdWuNGWEeE/nCYuuVnBD/XmRDo=; b=LUDhknS0Ft+8WB6cg+O1E4PJ7CLa/dVXEh1ijC4FAWDOR7VsYiosu8AyuLsM7l582T mvmNwIrjCFH10AA3wVIePhGuixNmAK4826KJTM41+wsWQrcoxPOYmEJIKFaQRXhy44Gp GIts0fzMhJwRvqVWPmXCqUQCx9npZLGAts49ESC/zn7Bv4Mqtc4F8FCdy+rupt1aW5yM qCw2M4r2ndKkPzZT+E6YxfD5NrUYbpk5KwWGAt07jmALQKAoe8r+Phiqa9u2ctQ5F3ZC 1HkYj86zEhGVgv7M5y11+iAw68GTRD4N/DXbtJ73Ze+yuZR/Jlee7432v6THDv84g9oi 69GQ== X-Gm-Message-State: AOAM532qGT6V28JM44WQ/YGyhcYoix7nXdpTPSqgY1O4yv+A0bqRT9MA Sip7hgT/6j5zpGhaAvx/43tjen0nCZDRhyI+Py4NWUy+Fez3UeSGQ+vik/860HoREC0bJxEZO1m vtNGD1nrCZtB09r2r/TLywBo56juX5Vh+zyPTjeWP3Lam9TNee7Y4G+ZaJ44JAY88WxwZ X-Received: from jleconte.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:c68]) (user=jleconte job=sendgmr) by 2002:a1c:3546:: with SMTP id c67mr456198wma.1.1613490793474; Tue, 16 Feb 2021 07:53:13 -0800 (PST) Date: Tue, 16 Feb 2021 15:53:08 +0000 Message-Id: <20210216155308.3327069-1-jleconte@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog From: Jeremy Leconte To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] libavfilter: avoid UB nullptr-with-offset. 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 Cc: Jeremy Leconte Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7+HsJPOs+qJA Content-Length: 1228 --- libavfilter/vf_scale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 58eee96744..98cef5eb4b 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -631,7 +631,7 @@ static int scale_slice(AVFilterLink *link, AVFrame *out_buf, AVFrame *cur_pic, s int in_stride[4],out_stride[4]; int i; - for (i=0; i<4; i++) { + for (i=0; i<4 && cur_pic->data[i] != NULL; i++) { int vsub= ((i+1)&2) ? scale->vsub : 0; in_stride[i] = cur_pic->linesize[i] * mul; out_stride[i] = out_buf->linesize[i] * mul;