mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve error handing in anetFDToString to avoid returning successfully with garbage. (#8678) 

Check for errors in inet_ntop and snprintf rather than ignore them
and return success (with garbage output).
The check for ip_len == 0 seems like dead code, removed.
This commit is contained in:
George Anderson Guimarães 2021-05-11 06:27:08 -05:00 committed by GitHub
parent 8526e04e7b
commit e01c92a5ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/anet.c
View File

@ -541,18 +541,26 @@ int anetFdToString(int fd, char *ip, size_t ip_len, int *port, int fd_to_str_typ
} else { } else {
if (getsockname(fd, (struct sockaddr *)&sa, &salen) == -1) goto error; if (getsockname(fd, (struct sockaddr *)&sa, &salen) == -1) goto error;
} }
if (ip_len == 0) goto error;
if (sa.ss_family == AF_INET) { if (sa.ss_family == AF_INET) {
struct sockaddr_in *s = (struct sockaddr_in *)&sa; struct sockaddr_in *s = (struct sockaddr_in *)&sa;
if (ip) inet_ntop(AF_INET,(void*)&(s->sin_addr),ip,ip_len); if (ip) {
if (inet_ntop(AF_INET,(void*)&(s->sin_addr),ip,ip_len) == NULL)
goto error;
}
if (port) *port = ntohs(s->sin_port); if (port) *port = ntohs(s->sin_port);
} else if (sa.ss_family == AF_INET6) { } else if (sa.ss_family == AF_INET6) {
struct sockaddr_in6 *s = (struct sockaddr_in6 *)&sa; struct sockaddr_in6 *s = (struct sockaddr_in6 *)&sa;
if (ip) inet_ntop(AF_INET6,(void*)&(s->sin6_addr),ip,ip_len); if (ip) {
if (inet_ntop(AF_INET6,(void*)&(s->sin6_addr),ip,ip_len) == NULL)
goto error;
}
if (port) *port = ntohs(s->sin6_port); if (port) *port = ntohs(s->sin6_port);
} else if (sa.ss_family == AF_UNIX) { } else if (sa.ss_family == AF_UNIX) {
if (ip) snprintf(ip, ip_len, "/unixsocket"); if (ip) {
int res = snprintf(ip, ip_len, "/unixsocket");
if (res < 0 || (unsigned int) res >= ip_len) goto error;
}
if (port) *port = 0; if (port) *port = 0;
} else { } else {
goto error; goto error;