From: Daniel Sabogal Date: Sat, 24 Sep 2016 01:10:07 +0000 (-0400) Subject: fix getservby*_r result pointer value on error X-Git-Tag: v1.1.16~64 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d7a3f40c8de414122eb8eb2131291782ee8ed15;p=oweals%2Fmusl.git fix getservby*_r result pointer value on error this is a clone of the fix to the gethostby*_r functions in commit fe82bb9b921be34370e6b71a1c6f062c20999ae0. the man pages document that the getservby*_r functions set this pointer to NULL if there was an error or if no record was found. --- diff --git a/src/network/getservbyname_r.c b/src/network/getservbyname_r.c index 056c2f33..ad3d6164 100644 --- a/src/network/getservbyname_r.c +++ b/src/network/getservbyname_r.c @@ -15,6 +15,8 @@ int getservbyname_r(const char *name, const char *prots, struct service servs[MAXSERVS]; int cnt, proto, align; + *res = 0; + /* Align buffer */ align = -(uintptr_t)buf & ALIGN-1; if (buflen < 2*sizeof(char *)+align) diff --git a/src/network/getservbyport_r.c b/src/network/getservbyport_r.c index a0a7caec..0ae0e415 100644 --- a/src/network/getservbyport_r.c +++ b/src/network/getservbyport_r.c @@ -20,6 +20,7 @@ int getservbyport_r(int port, const char *prots, if (r) r = getservbyport_r(port, "udp", se, buf, buflen, res); return r; } + *res = 0; /* Align buffer */ i = (uintptr_t)buf & sizeof(char *)-1;