Fix bug in getnameinfo

th-otto · th-otto · commit 419bb7f54a0e · 2023-08-27T12:34:35.000+02:00
It did not always print a numeric port to the supplied buffer
diff --git a/socket/getnameinfo.c b/socket/getnameinfo.c
@@ -52,13 +52,13 @@ int __getnameinfo(
 		return EAI_FAMILY;
 	}
 
-	ok = 0;
 	if (host != NULL && hostlen > 0)
 	{
 		switch (sa->sa_family)
 		{
 		case AF_INET:
 		case AF_INET6:
+			ok = 0;
 			if (!(flags & NI_NUMERICHOST))
 			{
 				if (sa->sa_family == AF_INET6)
@@ -151,6 +151,7 @@ int __getnameinfo(
 			strncpy(serv, ((const struct sockaddr_un *) sa)->sun_path, servlen);
 		} else
 		{								/* AF_INET || AF_INET6 */
+			ok = 0;
 			if (!(flags & NI_NUMERICSERV))
 			{
 				struct servent *s;

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,13 @@ int __getnameinfo(`
`52`	`52`	`return EAI_FAMILY;`
`53`	`53`	`}`
`54`	`54`
`55`		`- ok = 0;`
`56`	`55`	`if (host != NULL && hostlen > 0)`
`57`	`56`	`{`
`58`	`57`	`switch (sa->sa_family)`
`59`	`58`	`{`
`60`	`59`	`case AF_INET:`
`61`	`60`	`case AF_INET6:`
	`61`	`+ ok = 0;`
`62`	`62`	`if (!(flags & NI_NUMERICHOST))`
`63`	`63`	`{`
`64`	`64`	`if (sa->sa_family == AF_INET6)`
`@@ -151,6 +151,7 @@ int __getnameinfo(`
`151`	`151`	`strncpy(serv, ((const struct sockaddr_un *) sa)->sun_path, servlen);`
`152`	`152`	`} else`
`153`	`153`	`{ /* AF_INET \|\| AF_INET6 */`
	`154`	`+ ok = 0;`
`154`	`155`	`if (!(flags & NI_NUMERICSERV))`
`155`	`156`	`{`
`156`	`157`	`struct servent *s;`