From patchwork Mon Jul 8 04:25:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean McGovern X-Patchwork-Id: 50399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5553901vqv; Sun, 7 Jul 2024 21:26:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVF4mlxQeLuMG2iEVeQ2JRLdVR2V2TFvlB5abi37gs16TsLbUJr4TlDz2BAbjn6XxQbu/b3mk60n1s0yUg1Lfef9GckLvocwB2m1Q== X-Google-Smtp-Source: AGHT+IH/sSwwJrWNwwNfRmu2QnJPXhIkUlXPvfp68PsdTTyr5o3F2ScR9p1qTGUTJkvr0DJxQgas X-Received: by 2002:a05:6402:11ca:b0:57c:6d89:eaf0 with SMTP id 4fb4d7f45d1cf-58e5984d36amr7817210a12.14.1720412769572; Sun, 07 Jul 2024 21:26:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720412769; cv=none; d=google.com; s=arc-20160816; b=ccP3XnfFahdOPpxshiOUK8+ZJG9w4cScAjww6YYYIXp53FRp968rNSb7zLAAdfaeNy TAt2TGqi/wG7BQDVRSZZzxvJAeGu7LSyppHACXUPTm6D2GWpjBulQ6/95mw6U3paTS5Z DmBOgYv6+r6TDGST762ncc87W8e6qd5tYaqAvJUWK+QxhRNWs0RmC5moGBMQauixX9dy p/0l+cTLfnVKltmQDw+FzeXe/azINA/k6ZgCEiDppwhY0JHE65sOuS0HOkkjF5wItWnP D9gTCZsm2UlZirQMTD8rj4l1KVDutX04O0oLW3aWvlLuxRJA1VF7IikXgGGFQRtMFgej hymg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LMSqfjeDIOqX5EpazAfT+/vbTW1rSgULSD6bjFsDguA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=a9wmc4aAVjA6VuU+y9cRnTQGC7bFXDYzorNqKemKhgL3GLghsnfT2liGkp8p68WaxE Dh6RjWSJkur6D1yqTQJz0zguh/wJVcFEjPDClcHH1nBBWhB/mDeFcHmRhsDkyH/LWvSL qbAYjyu3vt1b7Fbaz0iOJyj4n6cF4S+j618a0MUhlTKpx2PTA3UsAapvn3WSIvpfSDnm OijMzOa61wMKpe1tzENvaET35tKuoYN4h5B6hQLLxH1S1gkGZokajVdiEXIWD4tJRPHX PbeXyBgg2XNxXv/nCjbmj+jm0NLZlR7T5cGGNRFAA8hMixJ6ImHG5NJRJ9u8QOmvRwBx iKfQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=A+St0uhj; 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 4fb4d7f45d1cf-58ce5929971si5704765a12.649.2024.07.07.21.26.09; Sun, 07 Jul 2024 21:26:09 -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=20230601 header.b=A+St0uhj; 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 9B42768DBC2; Mon, 8 Jul 2024 07:26:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AD7B68D9FB for ; Mon, 8 Jul 2024 07:25:58 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-447ea09c8ddso7114471cf.0 for ; Sun, 07 Jul 2024 21:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720412756; x=1721017556; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fu1yljI8Njnzrg94+R4G+n0zozxqnYWLfxa/H4E+YY8=; b=A+St0uhj9WeuBlZwzywg5H5G1aZe1CMwhSwOwhLYp5eB1oEzokVs0SW9Zb51Ed+YvN 9hoBKbM9rpfSBkIZjSI0wjXVTt20GlZjXd4dxatV5SClJy6aZen6WckxjMIqO4U5EICK An0w62iIcZltW3myIw6wtjPEgcvS0vMRt1JU2wQlO2zl/zrKdqHDUp7Yak5X4YHr5yik mJ8yu/HoNdejTJMN6TPcC32XCKug3dCRX/xVGwaoiYVZlwW6j0+RWRFlBIMPHCkycyZy AVoIW/o4/EY5nCCgZRM7kdpwKmk+wd42hH0JvhE+opQUkDL6qWL0O6tghYNXrFZf8EgA UyUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720412756; x=1721017556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fu1yljI8Njnzrg94+R4G+n0zozxqnYWLfxa/H4E+YY8=; b=cvcY6I5w9euVwYPVL31UI6eqEKljFnauMgrKSmnWL5H6XRYVbD4MG/udV6mO4esKRW cU38B6MS7qlT77RJFUC3SNE0rqj+Q0WtuUBp4v4pJ7CI9urnjHcqcEuwW2ZpIJh/lri6 A/ChLZDhZjw5pL1IAgYNv84LI8dzvC8goPPiAvh8v4Q+lV4D2JK26+7/5eMg96otGJQ+ UoRoIwOQpvnne8SGvCcCSxr2HA+KTH8zKQxWwCciVaXPDXptkgxZFguW9QkpICWid74M FuJ2aZG8Jw1SABWtAQXqzjqA1eQGlpl1Qgu96gMAcKS2QL6fcwSyGa8Qd5WscHZ0HXlq rKFg== X-Gm-Message-State: AOJu0YwKO5iLuJnbv0By8eqJLGKelJOaG/ni4bj946klKvg2FndJSskb d66DDRBrM/8QbSA9A/lwhzskV8f1I1VqLOmCFGEyM16w6uHgaeCvXJh9yw== X-Received: by 2002:a05:622a:6:b0:447:ea47:8fe7 with SMTP id d75a77b69052e-447ea47925amr45110651cf.39.1720412756034; Sun, 07 Jul 2024 21:25:56 -0700 (PDT) Received: from haruno.seanmcgovern.ca ([2607:f2c0:929e:a300:5a14:889f:e8c4:9ee4]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4465143ee51sm94712411cf.48.2024.07.07.21.25.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 21:25:55 -0700 (PDT) From: Sean McGovern To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 00:25:17 -0400 Message-Id: <20240708042517.5585-1-gseanmcg@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2] swscale: prevent undefined behaviour in the PUTRGBA macro 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: OUvHQD3yCTO0 --- libswscale/yuv2rgb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 977eb3a7dd..ac0b811f61 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -100,9 +100,9 @@ const int *sws_getCoefficients(int colorspace) #define PUTRGBA(dst, ysrc, asrc, i, abase) \ Y = ysrc[2 * i]; \ - dst[2 * i] = r[Y] + g[Y] + b[Y] + (asrc[2 * i] << abase); \ + dst[2 * i] = r[Y] + g[Y] + b[Y] + ((int32_t)(asrc[2 * i]) << abase); \ Y = ysrc[2 * i + 1]; \ - dst[2 * i + 1] = r[Y] + g[Y] + b[Y] + (asrc[2 * i + 1] << abase); + dst[2 * i + 1] = r[Y] + g[Y] + b[Y] + ((int32_t)(asrc[2 * i + 1]) << abase); #define PUTRGB48(dst, src, asrc, i, abase) \ Y = src[ 2 * i]; \