From nobody Mon Sep 25 13:46:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RvPKl6c1mz4rMMS; Mon, 25 Sep 2023 13:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvPKl64dgz4N0y; Mon, 25 Sep 2023 13:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695649579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lT5782MHKWPxfx6vPRPdQpanf+un6kxePbxRpYOTlqI=; b=gIeRktHB2/P53O+muhWQD3+EMIwiwmqc4Xv07KWVhRvvfcZYmZ9ff9zMr1i/KsDY9Q00jn 4RbU5NZIvboQ5Nk8YTZbaMUS5q29oCyPJzok0GqTajE8ZsaJw9rpvhgkcuBHfSG9CBi3cv pxGMPTSs67Ic4avu5LXVFWVbZIx7sgZwdzKjI2lM11ukKwhs/W9r2Yj07ZT4iO8k5H++x1 q79JDLsUhHJHr1rzBX34+Qco1TobXOgFEj9kkZshMxEsfDfl489uMYnRyg/1k9P52wYZXj RY5a18MTerT/JlN7vr/MhB88lYzzEQer3Ep+dRJif60Tbj8Jg4KsLO+vlOX5Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695649579; a=rsa-sha256; cv=none; b=vUdZ8PhAmtDsXxlxVyU1per9jW++quoIoAS+KXgulTWiLHJmArK53SSILzS9i30ktqgT9E b0aNoyWqMFlqoOeqm7KeFu0ULNAcKP6K79fVcEratwwP9wZHLRBGVr8wROe7p+ifQRpYfx I0xZzlLPFsNRcbSVmcgsZFNS+xuGIZuW0ZGtm1/Fdu5ezp49/7TQrbGLHABBfPEGH5SK5f uxt/EVQfZlrO38itZJ39G3hsqNdBOlsfT+gfX5iTVNTTpvPWqn9beY65Mhz/J+NJyAVDgs wn1/WHz8pTikL3prTD88h/HqQge8dn9fwI0mutnS7BPjAtTbUT9jWUlyv6ltlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695649579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lT5782MHKWPxfx6vPRPdQpanf+un6kxePbxRpYOTlqI=; b=nJpFIb8s3ggnax81MNpu+W6rZp6aUmMBZQEKJERyj2wpz+Ngqn2SoNJzscBmE7L1blQFrv W31u+FdnozVK51P7MK0c38WRlZNxnGaqrRaK0xV6hl+SyAT6QMUOW0/CC8OIh5Uzi6ioVW DTVv9+fpCjDnQzjfpNIi4HCUZhc59VQF93IQaKTbcHuAVzXCWrkkwqYCCyol+KPZeZr0Ox GGKzYmrJYJsbSSeJdySk2LBQOpjJhQmStWyWc66PRIHUf1RKJf1fYFg71SnDZ1eF1bk8Ze MnHFTiKELXhNk9/TnD/c4WOviBVNJFRrzYyfkF5e6cNN+bkUrmTBrWbXUj4Ccg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RvPKl587Dz1Rw; Mon, 25 Sep 2023 13:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PDkJ7e027743; Mon, 25 Sep 2023 13:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PDkJsm027740; Mon, 25 Sep 2023 13:46:19 GMT (envelope-from git) Date: Mon, 25 Sep 2023 13:46:19 GMT Message-Id: <202309251346.38PDkJsm027740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2871b8a185b2 - stable/14 - bspatch: use C23 overflow checking math now that it is available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2871b8a185b2c5b8de2d9f27301a7e523672b242 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2871b8a185b2c5b8de2d9f27301a7e523672b242 commit 2871b8a185b2c5b8de2d9f27301a7e523672b242 Author: Ed Maste AuthorDate: 2023-09-05 16:35:31 +0000 Commit: Ed Maste CommitDate: 2023-09-25 13:45:06 +0000 bspatch: use C23 overflow checking math now that it is available Reviewed by: des Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41771 (cherry picked from commit ee12faa062c04a49bf6fe4e6867bad8606e2413f) --- usr.bin/bsdiff/bspatch/bspatch.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c index a596ab1837dd..d7fabddabbfe 100644 --- a/usr.bin/bsdiff/bspatch/bspatch.c +++ b/usr.bin/bsdiff/bspatch/bspatch.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -64,15 +65,8 @@ add_off_t(off_t a, off_t b) { off_t result; -#if __GNUC__ >= 5 || \ - (defined(__has_builtin) && __has_builtin(__builtin_add_overflow)) - if (__builtin_add_overflow(a, b, &result)) + if (ckd_add(&result, a, b)) errx(1, "Corrupt patch"); -#else - if ((b > 0 && a > OFF_MAX - b) || (b < 0 && a < OFF_MIN - b)) - errx(1, "Corrupt patch"); - result = a + b; -#endif return result; }