From nobody Thu Mar 26 07:41:10 2026 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 4fhG175LQmz6WR61 for ; Thu, 26 Mar 2026 07:41:15 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhG1741Jgz3mPQ for ; Thu, 26 Mar 2026 07:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774510875; 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=hH5n/d6Y8iPljupAcCY7qTnZVQhEXbUBZKAtpJ958RI=; b=DG+fJZZQhXHqcVzK9EvqeGUapFT0CpqhrNbdBLUO0bsNxApFuFFw+gfn+EsxIdk4pq7Z4r POUOBZ2Hcts2qLWxXX/676TvMiCwJx0dcHB4ix7yeyt/PsTr/LeICSfVqJKi6iKLipsjie GSsnLf1v5oL/CT06dxOJHNiI6W49M7UYqZyzPVYwP6TNiblG+EgKESsCrQ42WllXA0QkLL Jtz+YdR8EotcvBQMfaDgq64PCl0gm8FgbM5r+dU9vuU4f6biE8K/C2Mg51EWChRU7LnDD8 TEeAS0cEQQvckySX2MeehvL9qEeQKkB9Dyfd1HCLCVkBxsheqvLW+TkbXMxY/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774510875; a=rsa-sha256; cv=none; b=LpoEmvy+vLwdNHNdOmNqR+2DOr3iiXdVKhWyddvAN5AgOvqBve3CtTpzTAKqJmCLR7mNG5 rZnD2jLGXcfGYVy6KkEk2febTDM4BA9jKpi43q7NflR1k3kTbVJDAir2N1Yht851LTQ1pD keYOOqabhEiau2p2Ef1pseBCbZwn0k+1O4XcFN5B25fbcTrLRfHbhOYM7QGJfyNbLpfYg2 C+9vyKoBFvxCigLPmh8ueo5Ll07QD+dkfiTQckCTplJfNwcJdwwOZkt/SmOVoG7rcoce9G 5bBJk73fksQ5GHI2PdvFeR4PxFlWRWV58UxlzMvO59QV32pnzdy687ekTVUlmg== 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=1774510875; 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=hH5n/d6Y8iPljupAcCY7qTnZVQhEXbUBZKAtpJ958RI=; b=a9T4M+bq165D8W8e35P7aHcrYiYxJGXhm+7EohXmWOLvDH3m52o7Kp2xBBWtNQE5NuyYfo LKeKedu86FmSAOi2MJHr/spPsyVTOiby2IViR5a8EwSddgXo2Kck8AyzSTKGRAHZDChlK9 Qg+obGKqt1RNrMj+TDNHh/0nCrw76GMrsItwujwpuVvVXDHK2KiUxNuQN7rUeBOx00BB/I 46k4J2vt8mA2LfdV6qwpcrLSKth1D35a1qNwRaftH57AHPgHEJW9H+jVBDNqQvUSm5NJ7R YQpnk7Slo7bK6D3cf1qjifiIkEFdqZh9a9BzOiOLPtxu2Hg2CnZLoVQ7pwGbsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhG1737RSzk0R for ; Thu, 26 Mar 2026 07:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c06a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 07:41:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 33424fd50ee0 - main - diff3: plug fd leak 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33424fd50ee0333bc6f70b5b14a270b85e5b5de1 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 07:41:10 +0000 Message-Id: <69c4e316.1c06a.68bddc8@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=33424fd50ee0333bc6f70b5b14a270b85e5b5de1 commit 33424fd50ee0333bc6f70b5b14a270b85e5b5de1 Author: Baptiste Daroussin AuthorDate: 2026-03-26 07:40:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-26 07:40:29 +0000 diff3: plug fd leak MFC After: 1 week Reported by: kib --- usr.bin/diff3/diff3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 75e8c6297855..8212b51e15a2 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -947,6 +947,7 @@ wait_and_check(int pd) if (errno != EINTR) err(2, "pdwait"); } + close(pd); if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) errx(2, "diff exited abnormally");