moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-26 01:58:49 -05:00
Code Issues Releases Wiki Activity

hostip: fix 3 coverity complaints

Browse Source 
Follow-up to 1a0ebf6632

- Check the return code to Curl_inet_pton() in two instances, even
  though we know the input is valid so the functions won't fail.

- Clear the 'struct sockaddr_in' struct before use so that the
  'sin_zero' field isn't left uninitialized.

Detected by Coverity.
Assisted-by: Harry Sintonen
Closes #7163
This commit is contained in:
Daniel Stenberg 2021-06-01 10:16:19 +02:00
parent 83036d86af
commit e1fcaf571f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/hostip.c
View File

@ -479,7 +479,8 @@ static struct Curl_addrinfo *get_localhost6(int port)
sa6.sin6_port = htons(port16); sa6.sin6_port = htons(port16);
sa6.sin6_flowinfo = 0; sa6.sin6_flowinfo = 0;
sa6.sin6_scope_id = 0; sa6.sin6_scope_id = 0;
Curl_inet_pton(AF_INET6, "::1", ipv6); if(Curl_inet_pton(AF_INET6, "::1", ipv6) < 1)
return NULL;
memcpy(&sa6.sin6_addr, ipv6, sizeof(ipv6)); memcpy(&sa6.sin6_addr, ipv6, sizeof(ipv6));
ca->ai_flags = 0; ca->ai_flags = 0;
@ -511,9 +512,12 @@ static struct Curl_addrinfo *get_localhost(int port)
if(!ca) if(!ca)
return NULL; return NULL;
/* memset to clear the sa.sin_zero field */
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
sa.sin_port = htons(port16); sa.sin_port = htons(port16);
Curl_inet_pton(AF_INET, "127.0.0.1", (char *)&ipv4); if(Curl_inet_pton(AF_INET, "127.0.0.1", (char *)&ipv4) < 1)
return NULL;
memcpy(&sa.sin_addr, &ipv4, sizeof(ipv4)); memcpy(&sa.sin_addr, &ipv4, sizeof(ipv4));
ca->ai_flags = 0; ca->ai_flags = 0;
@ -521,7 +525,6 @@ static struct Curl_addrinfo *get_localhost(int port)
ca->ai_socktype = SOCK_STREAM; ca->ai_socktype = SOCK_STREAM;
ca->ai_protocol = IPPROTO_TCP; ca->ai_protocol = IPPROTO_TCP;
ca->ai_addrlen = (curl_socklen_t)ss_size; ca->ai_addrlen = (curl_socklen_t)ss_size;
ca->ai_next = NULL;
ca->ai_addr = (void *)((char *)ca + sizeof(struct Curl_addrinfo)); ca->ai_addr = (void *)((char *)ca + sizeof(struct Curl_addrinfo));
memcpy(ca->ai_addr, &sa, ss_size); memcpy(ca->ai_addr, &sa, ss_size);
ca->ai_canonname = (char *)ca->ai_addr + ss_size; ca->ai_canonname = (char *)ca->ai_addr + ss_size;