From nobody Tue Apr 12 21:38:11 2022 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 CF0D11AF5B97; Tue, 12 Apr 2022 21:38:11 +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 4KdJxH5XH6z4bPY; Tue, 12 Apr 2022 21:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649799491; 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=TzLHjrDPKeeitJA62GeG50mCHxXyZ/vvnRzeucIvc3Q=; b=itiB3GMIi1mpotGWwGaurZjXqbVxQfir5Z0RzV7XAbGCaonJxaaxH30hsUBLhyL+Y+tmfO AuH0Q1YHZbnJd1L1vArPykdswMjB5N2FezFIJNCyNxgndzy2qmHBNZ+bdj0tnSocCkK3lL WUVOIIh8XNsvFTeo+QsoUIAYZ4s/80KRWMbpFnP97mPm+DV94VB6IQSddcUB4UQBaTVyhl zZd3q2LgmmJoU58Q8TU41mvHCMdU1YxDHjWQ9kL0r/udiA7ZdgeivabeQrVMxIY4jDb5gL 4drBHLAAIiJ3bnwzTOJZC21qETo5PM2VjBolq7Mf2HpOi7R8xLtoDRjoHKWl4w== 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 9EA9C1F0D8; Tue, 12 Apr 2022 21:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23CLcBDS008323; Tue, 12 Apr 2022 21:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CLcBco008322; Tue, 12 Apr 2022 21:38:11 GMT (envelope-from git) Date: Tue, 12 Apr 2022 21:38:11 GMT Message-Id: <202204122138.23CLcBco008322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6e563a1b6084 - main - libctf: Fix recursive descent into anonymous SOU fields 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e563a1b608438504d963c2d7c70e50d2e75af46 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649799491; 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=TzLHjrDPKeeitJA62GeG50mCHxXyZ/vvnRzeucIvc3Q=; b=JzyIuZjbkAZZTM0CPhMNls2sdiO9pXrn5bftNgCSvvZPsxQ7Q0nyjSgGP6EYZBxu/O2C+A 09OZ96WtSY5fthPzfGf+btSOe62mjAsASNlIFoNhFHPdfHD9p/0mf+ubLOWtG0LyDJF7IB Cz135rrcskfl9FQt1AKgdSfWmETjjpmrAiz31JKGQCbc/RWTByqq/4Y1srNBkK5RrMo4I2 yk1OzzwtBLpSMRKf3vR1B9NXpnUdYEX6PW8I3dRjWuhGbfcN4EbVPjQlJnnUlYWUN1gBjw y193+NRhAAo7FWZP+tQCWjRXA7G4t3Rvt0XeDuuoKRfjOlb6EgiCGBJW6mZTtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649799491; a=rsa-sha256; cv=none; b=k1a3PhFfmJHzrbnVgIOR13H9dsMdbk5SewsU+MRBAj9Cu6Y3GuGGcK75Ko0ksLK47T3ZRw zQMBe5ogVCz1aBSpuluJc3zLxe1NL/Ksz5mXUPwM6L+L/p6lnzcSioTHYamEC7b0DcjF6k 379GEWa5r47KbflrFaaiM03cCDV6ctivxO6RwGKQqJj1otfXrhbIfH1cUBybcPGN0unsVF j7WglVQoU2kuY8/n7wrpH5kK4Kv5mVmNDAZ1WeTgTsUaoagcNhWBbluse4xD4fNjuFYt+m 7wVvVHapvKO4bnyz3GVLnrfZW+AaMHRcLE71k0SLwgr3A315xnnwjR3qWeH2MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e563a1b608438504d963c2d7c70e50d2e75af46 commit 6e563a1b608438504d963c2d7c70e50d2e75af46 Author: Mark Johnston AuthorDate: 2022-04-12 19:24:40 +0000 Commit: Mark Johnston CommitDate: 2022-04-12 21:29:53 +0000 libctf: Fix recursive descent into anonymous SOU fields PR: 262412 Tested by: dhw, gallatin Fixes: a6fb86917362 ("libctf: Handle CTFv3 containers") MFC after: 3 days Sponsored by: The FreeBSD Foundation --- cddl/contrib/opensolaris/common/ctf/ctf_types.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_types.c b/cddl/contrib/opensolaris/common/ctf/ctf_types.c index de8269659c29..a3fe0bba4a9d 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_types.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_types.c @@ -818,8 +818,8 @@ _ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, ulong_t off, ctf_get_ctm_info(fp, mp, size, &increment, &type, &offset, &name1); - if (name1 == NULL && - _ctf_member_info(fp, type, name1, offset + off, mip) == 0) + if (name1[0] == '\0' && + _ctf_member_info(fp, type, name, offset + off, mip) == 0) return (0); if (strcmp(name1, name) == 0) { mip->ctm_type = type;