From nobody Mon Apr 18 16:39:35 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 940EC11D4D09; Mon, 18 Apr 2022 16:39:37 +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 4Kht201Hg7z4vJg; Mon, 18 Apr 2022 16:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650299976; 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=+gtKJUCd2XS2KVgy1F6KVja1iBHTY7XaDJxbubUe/M8=; b=gqF3dOFQA2kwMLbKSXPNcnM8ixW2/9HmHLQGz8wPicKeJnfKBaDuCXzMJcMtogUpX0RXjq WnjIcVkNXLHoRk1WKMkJ4Hpt/hunkTBSNH6Y+vb6d2t/KcazKPI0nsHblIX1IvckzQEJ3y 2207U+pV6g8xq4nMwALruBviX81UC6VfJYKc6Yg6F3IVF/zDa8GfeMgidd3rlPpTxdRp67 MP+yHyKaBMIFYxbiCrz1WzN7J4vcJThAWkgfWfX0hznEnh4b3nXF7wnp2PARWM1jrYn+ec /tefXAqh31QRd/fPtrwDcunvwCUSA46RpFtKTACqCKXmD/FxKM4Pf7VtfglkwQ== 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 5E19D160D4; Mon, 18 Apr 2022 16:39:35 +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 23IGdZR8085929; Mon, 18 Apr 2022 16:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IGdZ2p085928; Mon, 18 Apr 2022 16:39:35 GMT (envelope-from git) Date: Mon, 18 Apr 2022 16:39:35 GMT Message-Id: <202204181639.23IGdZ2p085928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5f649725da97 - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 5f649725da97c05329f8e37eb0fd4fba0f289b43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650299976; 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=+gtKJUCd2XS2KVgy1F6KVja1iBHTY7XaDJxbubUe/M8=; b=Tzh6sgvbMd5kD4byY45NZFOLJROitk90YcAomDHoVp3hFIYb6k+u7d4hIBAAHBapXQJGG3 DF5Vz7MocgxSDa6Yia54gpBo/WgVpFuy1PgWELOOkv/l8RV57uiGBP71yU6ZUlWxhG0fL8 6k4Osy3CHRNKSaHyOBC0KogBZ+GiCfNfcc8dhYw/jsMwK+JTy2fbXLBVPcEIubRiRWIWtI qH1uGAaIMqYv6oyubBUnEn5bV5hLFJKoGSQ0KRORRwnGyjAbhyqI239rHcPvjQtoRWaz+c mmvXSSjjUNLOhEUrzQ/6MPjjQPBZtnYjfOmhXNyD1+e4o5+w+JP60YKuCJjlAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650299976; a=rsa-sha256; cv=none; b=wR3pEz3CDCAsWWpPo3iflKnATSmGD8AfEXZg0E1PolZvf/jDnP91JCX+VA2ilcqHdzGLlZ LrZEXQ12vwqJle12YsbCiOp6W+4/CcZYXnO/ze3zfxwASHmZMHKx9YPBvNuq7Kl2B6/Yw7 9WSJrgzxoz5JtchJPn2A8NjhqFULf8oX+o0tq7WJyNRAYtgXQnP7JB3bCqZ36Cn2V4DXZG 97vtRzw1KfyOmPomqFKjd1hmDgL59RyfhQFSGIf4puz5bOh2VuKP0A2LiYemKmHmIgOHY3 Z+NwZwvWhO+ctQAb01POwdbqXBGn9ET7ls0HQK9zaqXTIFtBat6gQ04d/t+Wew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5f649725da97c05329f8e37eb0fd4fba0f289b43 commit 5f649725da97c05329f8e37eb0fd4fba0f289b43 Author: Mark Johnston AuthorDate: 2022-04-12 19:24:40 +0000 Commit: Mark Johnston CommitDate: 2022-04-18 16:39:00 +0000 libctf: Fix recursive descent into anonymous SOU fields Approved by: re (gjb) PR: 262412 Tested by: dhw, gallatin Fixes: a6fb86917362 ("libctf: Handle CTFv3 containers") Sponsored by: The FreeBSD Foundation (cherry picked from commit 6e563a1b608438504d963c2d7c70e50d2e75af46) (cherry picked from commit 8b01c3026b78152d9e0ca6f3758ea226f32e48b9) --- 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;