From patchwork Wed Mar 6 03:18:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12212 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 5120C4474CC for ; Wed, 6 Mar 2019 05:26:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CEC7689CD4; Wed, 6 Mar 2019 05:26:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1484680821 for ; Wed, 6 Mar 2019 05:26:33 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id g6so7338500pfh.13 for ; Tue, 05 Mar 2019 19:26:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tf8jTpcU1JWbUnxyL9gZKCRas0ZFYgBN648DsLrJjUI=; b=oEGjd3e4it1UQAjgIorcIWj6GZC6lwUS9b7SO0a17Va9kObegMxvyL4FRZuPCVSG4L saHs42+Z02uqprxm76OW3PV4t4o2F14wNcwJWmb8Omh+FJpGL/1DKzvPGpymAWj44KkO d4GiSF3DvS1V7zASwQHBJG27oF3tdiXCxo52GkUPW1tEwpp4foT9brfOXVUDhiALaSIP 7S6CS+V+6qsucFTuQtbKR4H3hFenDgY1UkB0CT5oVcPvE/z6h+ewUzWNtqrD5vA3Bux6 pechJA4IKFQqpyn+kfnCwSvcxTMb+e8vsV9oBtFCT8VsP9SejIOs/cKJJNxU9fMGUqR4 hh5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tf8jTpcU1JWbUnxyL9gZKCRas0ZFYgBN648DsLrJjUI=; b=NlKTi9fO97N/+HRZYJKiQ29DHdJiqEfeh291uMbW3CUJldGsC5wXB1/g7cz9zBnWl+ prZtffqSbfTslTkI1c3wtxpy0p4WbapWlTPO5Dsvbjq2wGnRHWlFEQnyVkXM1m2xOJI/ vQcQd0wgI36IzEAZxXpws7hnMPCHcxxxBSgt9B4NrJAxu1A0lxklN6QURLoOu9PfGW5m gIQR0/k65pnqtS7yOGrAiuR5K2RW1lcHGRpN7108bRcZVIQusZu0F8zpTNCLdY9Vje9k oYiGNCeORi6KE6eVukBZBCgUQd1CTlMQ62J8FEsstxIK0SCTb9H2awG44SdL2GBgIfUz ebrw== X-Gm-Message-State: APjAAAXTrdWhwV3GYJ8qCW6XSMY4dtncwIUkVpfCgqmTx3Q53qZfWlSY Ib1U9O1qNXSeM2IQoa8AGLbF2wqWBBE= X-Google-Smtp-Source: APXvYqyr75y5r5CLy6KVIB69xHtE89Ol5PdLQ8kA6VR31irbfaKf84jZeHByfySrR/hvsartT7dX4g== X-Received: by 2002:a17:902:9307:: with SMTP id bc7mr4639233plb.234.1551842320600; Tue, 05 Mar 2019 19:18:40 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id d5sm557372pfo.83.2019.03.05.19.18.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 19:18:39 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2019 11:18:26 +0800 Message-Id: <1551842307-3607-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1551842307-3607-1-git-send-email-mypopydev@gmail.com> References: <1551842307-3607-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavfi/nlmeans: Checking number precision when computing integral images 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao accumulation of 8-bits uint_8 (uint8_t *src) into 32-bits (uint32_t *ii) data type, it will have a risk of an integral value becoming larger than the 32-bits integer capacity and resulting in an integer overflow. For this risk, add a checking with warning message. Signed-off-by: Jun Zhao --- libavfilter/vf_nlmeans.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index dcb5a03..31c8304 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -236,6 +236,13 @@ static void compute_ssd_integral_image(const NLMeansDSPContext *dsp, // adjusted end x position of the safe area after width of the safe area gets aligned const int endx_safe = startx_safe + safe_pw; + // accumulation of 8-bits uint_8 (uint8_t *src) into 32-bits (uint32_t *ii) + // data type, it will have a risk of an integral value becoming larger than + // the 32-bits integer capacity and resulting in an integer overflow. + if ((w * h * UINT8_MAX) > UINT32_MAX) + av_log(NULL, AV_LOG_WARNING, + "image (%d x %d) integral value maybe overflow.\n", w ,h); + // top part where only one of s1 and s2 is still readable, or none at all compute_unsafe_ssd_integral_image(ii, ii_linesize_32, 0, 0,