From patchwork Fri Mar 20 20:41:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 132108 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id C0CD64C91751 for ; Fri, 20 Mar 2026 20:44:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C0CD64C91751 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dIl2qNE3 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id DF5234C900E1 for ; Fri, 20 Mar 2026 20:41:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF5234C900E1 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DF5234C900E1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774039274; cv=none; b=MKKYyExPW8r400+Sc8EVZkcNlYIv1cVo6o/ZvtB1Y2zwdM1WMMYDhjDzifUPg3w6y/9Sj0FkKMrq0EezithAC+YEDOUnpCEVeYrOV9NMQrPFefxrjoVVVmN2Qe+Rg+IE4JHhQ9m5WuS/wGoPq295Im6Xw2RqO2W9gnNcAVyx9SU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774039274; c=relaxed/simple; bh=NcU1GhL1KWOT6QvbfjGddwECuhaDRe97x0cHNkA4h8g=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=tyskH4RUh81MazABvf2r8x747dHB1N0h5kZL5C4W2erF9gFkv9WfTujdA0He42zz3NmJ+NRfp14XeCeBYnz9+Q/oCLyX4WjRxudoemWDstM4jpb3KKrDzMY9te7mLlZ9fiB9V1EbkhRmYS5pr+EzzKsnt0kVsyYjFiT9j1RvePg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DF5234C900E1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774039273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=e919GZJdi4pi2g7iRbnfJTrJnB0Ton0azDrsymkiJFI=; b=dIl2qNE3qCydfG1wwkog9eipIAxmXgjjrgDR3w7Ie3ek+WgfW4xnVTThHLtd+pL8oZfocV /vEKeU+A4DHpp0SPsNA5GpkFt6QF1d5yDXFAE8X9rV+ndS1lGNXX6p7IH7g9FXZFXXQGgS yUbrmbmS3ZjKpdjST8m4KZ3Dag+2fhs= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-N6yiEC-wP7SZf03GniCanQ-1; Fri, 20 Mar 2026 16:41:12 -0400 X-MC-Unique: N6yiEC-wP7SZf03GniCanQ-1 X-Mimecast-MFC-AGG-ID: N6yiEC-wP7SZf03GniCanQ_1774039271 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 55A3D195608C for ; Fri, 20 Mar 2026 20:41:11 +0000 (UTC) Received: from fweimer-oldenburg.csb.redhat.com (unknown [10.45.224.63]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 661641800351 for ; Fri, 20 Mar 2026 20:41:09 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 01/23] support: Update support_format_* NSS formatting routines for null pointers In-Reply-To: Message-ID: <6bf77cf6e09f069826341a381625578b4c2a2392.1774037705.git.fweimer@redhat.com> References: X-From-Line: 6bf77cf6e09f069826341a381625578b4c2a2392 Mon Sep 17 00:00:00 2001 Date: Fri, 20 Mar 2026 21:41:07 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: AFbhqcG42SpHgyinu1Te5sYMEMYRLeABP_7KbY307AU_1774039271 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Some tests will need to check for the presence of null pointers. It makes sense to support this in the formatting functions. Reviewed-by: Carlos O'Donell --- support/support_format_group.c | 7 +++++-- support/support_format_hostent.c | 31 ++++++++++++++++++++----------- support/support_format_netent.c | 9 +++++++-- support/support_format_protoent.c | 11 ++++++++--- support/support_format_rpcent.c | 8 ++++++-- support/support_format_servent.c | 9 +++++++-- support/support_format_sgrp.c | 16 ++++++++++++---- 7 files changed, 65 insertions(+), 26 deletions(-) diff --git a/support/support_format_group.c b/support/support_format_group.c index fb714564cd..a9ad4973c0 100644 --- a/support/support_format_group.c +++ b/support/support_format_group.c @@ -35,8 +35,11 @@ support_format_group (const struct group *g) fprintf (mem.out, "name: %s\n", g->gr_name); fprintf (mem.out, "passwd: %s\n", g->gr_passwd); fprintf (mem.out, "gid: %u\n", (unsigned) g->gr_gid); - for (char **mp = g->gr_mem; *mp != NULL; ++mp) - fprintf (mem.out, "member: %s\n", *mp); + if (g->gr_mem != NULL) + for (char **mp = g->gr_mem; *mp != NULL; ++mp) + fprintf (mem.out, "member: %s\n", *mp); + else + fputs ("gr_mem: (null)\n", mem.out); xfclose_memstream (&mem); return mem.buffer; diff --git a/support/support_format_hostent.c b/support/support_format_hostent.c index f76ec459cd..4b3ef8e1d8 100644 --- a/support/support_format_hostent.c +++ b/support/support_format_hostent.c @@ -59,17 +59,26 @@ support_format_hostent (const struct hostent *h) xopen_memstream (&mem); fprintf (mem.out, "name: %s\n", h->h_name); - for (char **alias = h->h_aliases; *alias != NULL; ++alias) - fprintf (mem.out, "alias: %s\n", *alias); - for (unsigned i = 0; h->h_addr_list[i] != NULL; ++i) - { - char buf[128]; - if (inet_ntop (h->h_addrtype, h->h_addr_list[i], - buf, sizeof (buf)) == NULL) - fprintf (mem.out, "error: inet_ntop failed: %m\n"); - else - fprintf (mem.out, "address: %s\n", buf); - } + + if (h->h_aliases != NULL) + for (char **alias = h->h_aliases; *alias != NULL; ++alias) + fprintf (mem.out, "alias: %s\n", *alias); + else + fputs ("h_aliases: (null)\n", mem.out); + + if (h->h_addr_list != NULL) + for (unsigned i = 0; h->h_addr_list[i] != NULL; ++i) + { + char buf[128]; + if (inet_ntop (h->h_addrtype, h->h_addr_list[i], + buf, sizeof (buf)) == NULL) + fprintf (mem.out, "error: inet_ntop failed: %m\n"); + else + fprintf (mem.out, "address: %s\n", buf); + } + else + fputs ("h_addr_list: (null)\n", mem.out); + if (h->h_length != address_length (h->h_addrtype)) { char *family = support_format_address_family (h->h_addrtype); diff --git a/support/support_format_netent.c b/support/support_format_netent.c index 7f08476dd3..1ff2f93c26 100644 --- a/support/support_format_netent.c +++ b/support/support_format_netent.c @@ -41,8 +41,13 @@ support_format_netent (const struct netent *e) if (e->n_name != NULL) fprintf (mem.out, "name: %s\n", e->n_name); - for (char **ap = e->n_aliases; *ap != NULL; ++ap) - fprintf (mem.out, "alias: %s\n", *ap); + + if (e->n_aliases != NULL) + for (char **ap = e->n_aliases; *ap != NULL; ++ap) + fprintf (mem.out, "alias: %s\n", *ap); + else + fputs ("n_aliases: (null)\n", mem.out); + if (e->n_addrtype != AF_INET) fprintf (mem.out, "addrtype: %d\n", e->n_addrtype); /* On alpha, e->n_net is an unsigned long. */ diff --git a/support/support_format_protoent.c b/support/support_format_protoent.c index 25c177f5da..187e7ff318 100644 --- a/support/support_format_protoent.c +++ b/support/support_format_protoent.c @@ -32,9 +32,14 @@ support_format_protoent (const struct protoent *e) struct xmemstream mem; xopen_memstream (&mem); - fprintf (mem.out, "name: %s\n", e->p_name); - for (char **ap = e->p_aliases; *ap != NULL; ++ap) - fprintf (mem.out, "alias: %s\n", *ap); + fprintf (mem.out, "name: %s\n", e->p_name ?: "(null)"); + + if (e->p_aliases != NULL) + for (char **ap = e->p_aliases; *ap != NULL; ++ap) + fprintf (mem.out, "alias: %s\n", *ap); + else + fputs ("p_aliases: (null)\n", mem.out); + fprintf (mem.out, "proto: %d\n", e->p_proto); xfclose_memstream (&mem); diff --git a/support/support_format_rpcent.c b/support/support_format_rpcent.c index 1b898f3e27..66ee00f319 100644 --- a/support/support_format_rpcent.c +++ b/support/support_format_rpcent.c @@ -34,8 +34,12 @@ support_format_rpcent (const struct rpcent *r) fprintf (mem.out, "name: %s\n", r->r_name); fprintf (mem.out, "number: %d\n", r->r_number); - for (char **ap = r->r_aliases; *ap != NULL; ++ap) - fprintf (mem.out, "alias: %s\n", *ap); + + if (r->r_aliases != NULL) + for (char **ap = r->r_aliases; *ap != NULL; ++ap) + fprintf (mem.out, "alias: %s\n", *ap); + else + fputs ("r_aliases: (null)\n", mem.out); xfclose_memstream (&mem); return mem.buffer; diff --git a/support/support_format_servent.c b/support/support_format_servent.c index fbe8138222..b8823ab485 100644 --- a/support/support_format_servent.c +++ b/support/support_format_servent.c @@ -34,8 +34,13 @@ support_format_servent (const struct servent *e) xopen_memstream (&mem); fprintf (mem.out, "name: %s\n", e->s_name); - for (char **ap = e->s_aliases; *ap != NULL; ++ap) - fprintf (mem.out, "alias: %s\n", *ap); + + if (e->s_aliases != NULL) + for (char **ap = e->s_aliases; *ap != NULL; ++ap) + fprintf (mem.out, "alias: %s\n", *ap); + else + fputs ("s_aliases: (null)\n", mem.out); + fprintf (mem.out, "port: %d\n", ntohs (e->s_port)); fprintf (mem.out, "proto: %s\n", e->s_proto); diff --git a/support/support_format_sgrp.c b/support/support_format_sgrp.c index d9b7d12478..0b4bdd7dfc 100644 --- a/support/support_format_sgrp.c +++ b/support/support_format_sgrp.c @@ -34,10 +34,18 @@ support_format_sgrp (const struct sgrp *s) fprintf (mem.out, "name: %s\n", s->sg_namp); fprintf (mem.out, "passwd: %s\n", s->sg_passwd); - for (char **ap = s->sg_adm; *ap != NULL; ++ap) - fprintf (mem.out, "admin: %s\n", *ap); - for (char **mp = s->sg_mem; *mp != NULL; ++mp) - fprintf (mem.out, "member: %s\n", *mp); + + if (s->sg_adm != NULL) + for (char **ap = s->sg_adm; *ap != NULL; ++ap) + fprintf (mem.out, "admin: %s\n", *ap); + else + fputs ("sg_adm: (null)\n", mem.out); + + if (s->sg_mem != NULL) + for (char **mp = s->sg_mem; *mp != NULL; ++mp) + fprintf (mem.out, "member: %s\n", *mp); + else + fputs ("sg_mem: (null)\n", mem.out); xfclose_memstream (&mem); return mem.buffer;