musl - musl - an implementation of the standard library for Linux-based systems

musl - an implementation of the standard library for Linux-based systems

diff options

author	Rich Felker <dalias@aerifal.cx>	2012年09月22日 16:19:06 -0400
committer	Rich Felker <dalias@aerifal.cx>	2012年09月22日 16:19:06 -0400
commit	4b49060da09b37e36ae08b49499c4a53b4f53890 (patch)
tree	9960eb1e18f23596df5c8bed196321cc97ae2652 /src
parent	15d111203221e988b45b47535f96889f4208c1a7 (diff)
download	musl-4b49060da09b37e36ae08b49499c4a53b4f53890.tar.gz

fix getaddrinfo to accept port 0 (zero)

new behavior can be summarized as: inputs that parse completely as a decimal number are treated as one, and rejected only if the result is out of 16-bit range. inputs that do not parse as a decimal number (where strtoul leaves anything left over in the input) are searched in /etc/services.

Diffstat (limited to 'src')

-rw-r--r--

src/network/getaddrinfo.c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index b9e562f7..b341912d 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c

@@ -76,8 +76,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru

if (serv) {

if (!*serv) return EAI_SERVICE;

port = strtoul(serv, &z, 10);

- if (!*z && port > 65535) return EAI_SERVICE;

- if (!port) {

+ if (*z) {

size_t servlen = strlen(serv);

char *end = line;

@@ -96,6 +95,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru

__fclose_ca(f);

if (feof(f)) return EAI_SERVICE;

}

+ if (port > 65535) return EAI_SERVICE;

port = htons(port);

}

generated by cgit v1.2.1 (git 2.18.0) at 2025年09月18日 09:03:45 +0000