From nobody Thu Mar 26 07:41:10 2026 X-Original-To: dev-commits-src-main@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 4fhG1243thz6WR86 for ; Thu, 26 Mar 2026 07:41:10 +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 4fhG123N0tz3mG9 for ; Thu, 26 Mar 2026 07:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774510870; 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=GOlXc0ryh23L2ru0o2W6NpoWritHy99t2dKapB/b9EyM3hYm+itm27lFfveoN+9Nc8RShb wZfIq4m2rzQVk0LxtLta2wiSHpkl12bVjcQl5mTm9PbDYegtd34ILEVSgSAb8qruPbzd3P A7vUW88cggHkCG7iVTzofkzSJhFwPKI04uxxWYBkvzqBz14mpOleStpafov7/V91GJbb/K B7JZn14Q5rvto+EnhHFkOUlYzEk/4v9ha4227+ps9tznOFS0+7ymCKjvPJVVirJ24h+Rzg cpDVt/3JbWE9ZjcBpQ1KO9N30GC3fGZZlHeu1bxdhvPancsXOTcq/nph77jYNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774510870; a=rsa-sha256; cv=none; b=i6hvtCbVrTUkyyg+nZtbnYaWSsZmhmhMzhu4CtJGQO0NQ6Ln3n3KpZ/h3cqWQr9JwAcvGx at67mGOShqecxzW0eRSadIPTq1/h0jCENehMbkY3J7VMAaZ6SFauS5uXPH8ygpdq7airwi Wu1zjjwyG8vIAgYy/OaT9x60HAwks8P+9BnNHNqTMA6kMBCms8KZzigamyKR5tBQW2YkCo 4hkJi/F7B/aXdV+YZ5FCnGKCcAPECe98f+iDc+HrrdkLzfwqt7dXOmmdMMbWFiJOfbAx9i iBkjfLghAzwDPtFioHDpmi9zrlFdxBMEM8PoYKoa4pU/OxIonV4bJeCjHYVnNQ== 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=1774510870; 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=SeloMOSVP/ZYGcRucZW1DS5uNno60o2JyuLYVE/oMpj/U2aM7tZpQvzil3AV1NS0IWBe0Z sIOArlyGqjNP5U4aXh/fh7K5xxYP0NWQlQSMx8kWVvYcT+LOssNOBTbP/BgGheXsQ5sLvR Gbts07eUzhePCrkUEFm/uuw0jtb59OMyIKcQfMICBIbYetCYB5hbWNIszlCmVuOPd+ZRgF LN2tb1ebBDAa7a28eCrVLbmlsT8V5NQY/K/snIXBjM6ieH9krudoiB7aRt8hR2GfqrsuZ7 i0byE1GTr75B/kBJ71Y9gi8S+BEg3fYOK6As0HjaawF1h7KPJyIJveQAN1W7VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhG122pR1zjjZ for ; Thu, 26 Mar 2026 07:41:10 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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");