From b0fc1b7a2fe8fcb18ee407227591bf25a86ffbaf Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 26 Jun 2026 00:30:05 +0200 Subject: Vendor import of pkgconf 2.9.92 Obtained from https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-2.9.92.tar.gz SHA1: 865d15aac5e720a8897b14e0f475736a810a9340 - SHA256: 1eeda57d5f7b8dd346278ea164536f313366bb10d531d7c490be439638942f6d - SHA512: a66960f79f83508e372ef948ec98f906abb31aed0b4c1a667f2cf8235f55ede1553fc5dfd1baaa6217a2d82c725448e64207b1dfb858f21fdb12f82e6771546f - One test folder in tests/lib1 had to be removed to avoid UTF-8 filenames in the tree. (Breaks `make create-source-packages`) Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57856 --- cli/spdxtool/serialize.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'cli/spdxtool/serialize.c') diff --git a/cli/spdxtool/serialize.c b/cli/spdxtool/serialize.c index 69ef3a70a3b1..fc5c460d77cb 100644 --- a/cli/spdxtool/serialize.c +++ b/cli/spdxtool/serialize.c @@ -169,7 +169,8 @@ spdxtool_serialize_object_add_take(spdxtool_serialize_object_list_t *object_list { free(node); free(keycopy); - spdxtool_serialize_object_free(object); + /* object->key/value are not assigned yet; free the struct itself */ + free(object); spdxtool_serialize_value_free(value); return NULL; } @@ -397,6 +398,18 @@ spdxtool_serialize_sbom(pkgconf_client_t *client, spdxtool_core_agent_t *agent, goto err; pkgconf_node_t *iter = NULL; + PKGCONF_FOREACH_LIST_ENTRY(spdx->maintainers.head, iter) + { + spdxtool_core_agent_t *maintainer = iter->data; + if (!maintainer) + { + errstr = "maintainers list corrupted"; + goto err; + } + if (!spdxtool_serialize_array_add_take(graph, spdxtool_core_agent_to_object(client, maintainer))) + goto err; + } + PKGCONF_FOREACH_LIST_ENTRY(spdx->licenses.head, iter) { spdxtool_simplelicensing_license_expression_t *expression = iter->data; -- cgit v1.3