Module Name: src
Committed By: riastradh
Date: Wed Feb 5 12:52:58 UTC 2025
Modified Files:
src/usr.bin/getnameinfo: getnameinfo.c
Log Message:
getnameinfo(1): Fix crash on, e.g., `getnameinfo -4 -S -p 25'.
If an address family is specified, but no address is given, and we're
only printing the service name anyway, just use the `any' address.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/getnameinfo/getnameinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/getnameinfo/getnameinfo.c
diff -u src/usr.bin/getnameinfo/getnameinfo.c:1.5 src/usr.bin/getnameinfo/getnameinfo.c:1.6
--- src/usr.bin/getnameinfo/getnameinfo.c:1.5 Wed Feb 5 12:45:54 2025
+++ src/usr.bin/getnameinfo/getnameinfo.c Wed Feb 5 12:52:58 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.5 2025/02/05 12:45:54 riastradh Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.6 2025/02/05 12:52:58 riastradh Exp $ */
/*
* Copyright (c) 2025 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: getnameinfo.c,v 1.5 2025/02/05 12:45:54 riastradh Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.6 2025/02/05 12:52:58 riastradh Exp $");
#endif
#include <sys/types.h>
@@ -170,7 +170,10 @@ main(int argc, char **argv)
addr_in = (struct sockaddr_in *)&addr_st;
addr_in->sin_family = family;
addr_in->sin_port = htons(port);
- if (inet_pton(family, address, &addr_in->sin_addr) == 0) {
+ if (address == NULL) {
+ addr_in->sin_addr.s_addr = INADDR_ANY;
+ } else if (inet_pton(family, address, &addr_in->sin_addr)
+ == 0) {
warnx("Invalid IPv4 address: %s", address);
return EXIT_FAILURE;
}
@@ -180,7 +183,11 @@ main(int argc, char **argv)
addr_in6 = (struct sockaddr_in6 *)&addr_st;
addr_in6->sin6_family = family;
addr_in6->sin6_port = htons(port);
- if (inet_pton(family, address, &addr_in6->sin6_addr) == 0) {
+ if (address == NULL) {
+ addr_in6->sin6_addr =
+ (struct in6_addr)IN6ADDR_ANY_INIT;
+ } else if (inet_pton(family, address, &addr_in6->sin6_addr)
+ == 0) {
warnx("Invalid IPv6 address: %s", address);
return EXIT_FAILURE;
}
