From nobody Fri Feb 28 21:18:04 2025 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 4Z4Lf51VC3z5p7lk; Fri, 28 Feb 2025 21:18:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z4Lf50jtVz3lwm; Fri, 28 Feb 2025 21:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740777485; 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=qxbNeZgT9e7wM0PR7s5Mvqf9VrZdmMFn5IofbMz5Mdk=; b=rzTFuJvxk10toX3eqkTKCGBmUaiVFXQr3UQo+F5rW3UILHJPRovC+zUtNbsgW31cnis3HI vMULyyHLpmLex4O2QXLJ90KOOoXtKatXNUNE4NA9ainmKUoUpqjvLod78QYoQUcOCTrx79 AuWSRuqClGEcznhGIjezphV7mjK6RHsD5uX0gJh0jDSB76WXyitDgew4GRln3cvaWaWQVz uuqWF4XUGlxmV5RhchHzZydntB5QybEl9y5P1684XJBLl3t77mXys4B1/2wo4pFM5kshKh OaoW34IDx9hxJafy5Zs+7kRNYcJpdUqHOWRe98k/DjAg1vrFNrQ60qlyRwOKaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740777485; a=rsa-sha256; cv=none; b=Ko1W+tzNWB9qj9X3Wx3ENwATxpgrYLJRO/FVdSNTBKzHKIolskhteLPugSgKG08XNxojeM 2OVHjBYpQ+ntE6tb5vOiHqOPU2cQiQku57tSfFck8R2DHqgH7ZEprD/61Hmu3NsApANJK8 IJ6hHPnLyECoCwwV4iRw/UKx0+R+ps1ddA6kefkdy+3u8m0FpVveYzPMjZVntxw/lEefBY tE4QubMJbyqsJ/348OYx5BuTKIybC8A88boumDr75cEuS6EqYpxQg209BagikWcVjyWS0i 4lhDyl2FQ2UAZCKDhuHjcKCyDM7CueK55RBzVO+IsD27hVI4hu40dmhFpqByBA== 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=1740777485; 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=qxbNeZgT9e7wM0PR7s5Mvqf9VrZdmMFn5IofbMz5Mdk=; b=Snj4J7MxJrsPvZ2IShn8afPZ83oHQmh77qeK1zwyFXBjrmLnnAiYjoGdPlKwb4etmGa69f pC6XsZiQq45UIglOarIdbTk2gQrI/SwHa30AOw/z4nbSIXe81R9D3iTiQMwNX50hLh7GwP IhxxrN4Ya3jpAcsEwTWm2Q1pfxid2Ly1snqaGCQupp0Jj5cjzWYh9dH4+btjoq8Y5+VhFo Qm19GVfU+v0JjuMjqs9YTDxvKfBxiCUid5RoiAQ+d9Ua9Ux/0PuFFz7XrGlBFXL4Yx3M7H BchcKBjs4XRH2YJ2TV3cav9gemano0f19DSbGwAFfUwkiJa7UoB7Dkhl52Xc3g== 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 4Z4Lf50Hbqzm78; Fri, 28 Feb 2025 21:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51SLI4cP099992; Fri, 28 Feb 2025 21:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51SLI4dI099989; Fri, 28 Feb 2025 21:18:04 GMT (envelope-from git) Date: Fri, 28 Feb 2025 21:18:04 GMT Message-Id: <202502282118.51SLI4dI099989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 337f5e7a44c4 - main - makefs: Compare pointer against NULL, not 0 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 337f5e7a44c4d5ac29e0b0c0fe957bb3b9bae222 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=337f5e7a44c4d5ac29e0b0c0fe957bb3b9bae222 commit 337f5e7a44c4d5ac29e0b0c0fe957bb3b9bae222 Author: Ed Maste AuthorDate: 2025-02-28 21:16:29 +0000 Commit: Ed Maste CommitDate: 2025-02-28 21:17:34 +0000 makefs: Compare pointer against NULL, not 0 Reported by: rpokala Sponsred by: The FreeBSD Foundation Fixes: 35a2e286157a ("makefs: Record inode for all entries in mtree mode") --- usr.sbin/makefs/cd9660/iso9660_rrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index e037f1db175f..1b8ce42da4c0 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -667,7 +667,7 @@ inode_map(iso9660_disk *diskStructure, uint64_t in) if (in != 0) { node = RB_FIND(inode_map_tree, &(diskStructure->rr_inode_map), &lookup); - if (node != 0) + if (node != NULL) return (node->value); }