From patchwork Thu May 27 15:06:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp527492iof; Thu, 27 May 2021 08:08:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw427/AkSoqJrmNpeNXX5IqLyMyp3xp7Wb++E5QOpHTsZN/u8O9p/BAYtX1A1rhEBH6yD4f X-Received: by 2002:aa7:da99:: with SMTP id q25mr4819799eds.198.1622128080616; Thu, 27 May 2021 08:08:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622128080; cv=none; d=google.com; s=arc-20160816; b=l99VHxczP840rW+ai4ZVzesZkcjvt8N7+NR7HoGlpqxwQ6ptqdGmiQOhEN6s5FdjPs bfBLgYF66pTCzj+p+/UWEmloKQBtXd3UjuEcUgV2o/xQMtNd6mMdxWfyu2YOFW3a2wst hASt/J5KC6MpZ3gOSL2Y0dl+F2O74maoVFwrhgza9HXrDvaSBqIWsvJqGG16XBFtzNvC PssSLNgyVKP24MtLAqM8FJjvsK1tE8LANePYCpkF58mR8B0vAPuNXSlQeQ58i0EYMVCf 52FcBbAiCiDP48vsFW2bnh0UPGTcFdC5iH0NsYbgk5VD0NNb4UE0En7MBrC4zXI31QAk DWfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=yDSFPnSNUhnVXCmsPBeD/2ujFheI31rNrAe10gGGDJg=; b=IlphykgcxqK43LbRW/LB7SGK5YHsJNeI/wryJQnsmH0Sd3iqGr3zvkITmvkrI2XvC8 FxcNPogZzOy/ZmB5MtHFpasDXbTTu/z6YoaV6lxRgA8vp7MfRAiXy8vBa77QPybUdwpO xsCmlooxQUya4z/rjlWbCdNM4zckMD8NLQREobPY0KWK8IKrwxeL/UGNv0yFNgemSJyY KrrWKJ7VnvVsUhV71zC/hpmydFhphqWlZ8x43VMKbLjEyuSBjm/dOb8F/aiQVYWYlSaH 9gtvVcRbKPDaUtE7egZ6Oa9pd3Zl88pYgLM2GLHcp50WPYCIjgRgeiNxOx6IUxmfTE8N zQ1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IQ6uj16f; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp6si3248706ejc.567.2021.05.27.08.07.52; Thu, 27 May 2021 08:08:00 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IQ6uj16f; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F333B68921B; Thu, 27 May 2021 18:07:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1F9D680B64 for ; Thu, 27 May 2021 18:07:41 +0300 (EEST) Received: by mail-qv1-f53.google.com with SMTP id a7so233595qvf.11 for ; Thu, 27 May 2021 08:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q0wtseu5Hnw76O/Hqm9LAMmnRGWSKZForPNuMZd4Bjo=; b=IQ6uj16fo5uOB6Ti0HwY77cwANB8RFpFVMbTAzh5iNVT1HLeQly38uXu2WtJl53YBF izN/C75t/MW+ipvzh0L05IoYKe7SbnMAoRJBSqlAHEyjS1HCuiWZ/Iq34piH/LMIo/1M k2G6poNfUA6RPp91nt51bTms3JLRTeXrYmRyNUFtJQ7AadcBgYq3IthKSfu7zjUkxpLz AKN6q1tCIf3jxaKyaPK997keHXzUW/cEI87Jm42pQ+ZlsD+Ts8nTZzNxgEC96zUqgfrv QFNwSE7k+fRBqjBz5u+sTBmZ2Hx0yFEDDGse6hxoI0fARNAY7+i6Yc3OjdfnMHe4JBOv KasQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q0wtseu5Hnw76O/Hqm9LAMmnRGWSKZForPNuMZd4Bjo=; b=RmIO4F2DrklTiHQh78XSzUIhCbKRnH1BQlMEdDrMCL6PXoKTOL6ir8qFwQtiI490yQ 4axMUPOPEErVKhWIfkZIo2wVXp2uC1pQMth0mtVG4LqVu3xVLfhBzrlemc3cUbRolIlk l0w6lH3cjPC3qqXjDLVht0vIaDkMiE6uWn3zoyUdD6wrOY2sNSIxNF2x8TwdyUmDNyrc Y2hIYWJkFJ/eVk6xkfCVsk/oavJr2mp+a1nyklQEH3sh3i2yRW0+158gIp8SZD6mwppm 2Hj+1QeAoA2qwE9d2xXQxAf5hzDVobcDbRBBkPT/QpTJI7bLhNWCNgU85H+QW8/I+uVx //Lg== X-Gm-Message-State: AOAM532dkCkEEq/DQAm8ybGQDTLcTDLGETlgcf5qzhJOTPYoVxqQWija PnPUnZYv7GE6ZbXwjTzetA4b0X+Qaps= X-Received: by 2002:ad4:4961:: with SMTP id p1mr4015545qvy.43.1622128059931; Thu, 27 May 2021 08:07:39 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.172]) by smtp.gmail.com with ESMTPSA id 7sm1640369qtu.38.2021.05.27.08.07.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 08:07:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 May 2021 12:06:57 -0300 Message-Id: <20210527150657.1199-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/mem: use GCC builtins to check for overflow in av_size_mult() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3Q6Y/rjzQmfQ Signed-off-by: James Almer --- libavutil/mem.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavutil/mem.h b/libavutil/mem.h index e21a1feaae..c876111afb 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -674,11 +674,18 @@ void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, */ static inline int av_size_mult(size_t a, size_t b, size_t *r) { - size_t t = a * b; + size_t t; + +#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5,1)) || AV_HAS_BUILTIN(__builtin_mul_overflow) + if (__builtin_mul_overflow(a, b, &t)) + return AVERROR(EINVAL); +#else + t = a * b; /* Hack inspired from glibc: don't try the division if nelem and elsize * are both less than sqrt(SIZE_MAX). */ if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b) return AVERROR(EINVAL); +#endif *r = t; return 0; }