moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

Brad Spencer found and fixed three flaws in the code, found with the new

Browse Source 
gcc 4.2.0 warning: -Waddress
This commit is contained in:
Daniel Stenberg 2007-06-02 20:09:23 +00:00
parent b084dc8760
commit 25d2a27c64
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ares/AUTHORS
View File

@ -25,3 +25,4 @@ Vlad Dinulescu
Brad House Brad House
Shmulik Regev Shmulik Regev
Ashish Sharma Ashish Sharma
Brad Spencer

3
ares/CHANGES
View File

@ -2,6 +2,9 @@
* June 2 2007 * June 2 2007
- Brad Spencer found and fixed three flaws in the code, found with the new
gcc 4.2.0 warning: -Waddress
- Brad House fixed VS2005 compiler warnings due to time_t being 64bit. - Brad House fixed VS2005 compiler warnings due to time_t being 64bit.
He also made recent Microsoft compilers use _strdup() instead of strdup(). He also made recent Microsoft compilers use _strdup() instead of strdup().

6
ares/ares_init.c
View File

@ -1059,7 +1059,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
ipbufpfx[0] = '\0'; ipbufpfx[0] = '\0';
/* Lets see if it is CIDR */ /* Lets see if it is CIDR */
/* First we'll try IPv6 */ /* First we'll try IPv6 */
if ((bits = ares_inet_net_pton(AF_INET6, ipbufpfx ? ipbufpfx : ipbuf, if ((bits = ares_inet_net_pton(AF_INET6, ipbufpfx[0] ? ipbufpfx : ipbuf,
&pat.addr.addr6, &pat.addr.addr6,
sizeof(pat.addr.addr6))) > 0) sizeof(pat.addr.addr6))) > 0)
{ {
@ -1069,7 +1069,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
if (!sortlist_alloc(sortlist, nsort, &pat)) if (!sortlist_alloc(sortlist, nsort, &pat))
return ARES_ENOMEM; return ARES_ENOMEM;
} }
if (ipbufpfx && if (ipbufpfx[0] &&
(bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addr.addr4, (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addr.addr4,
sizeof(pat.addr.addr4))) > 0) sizeof(pat.addr.addr4))) > 0)
{ {
@ -1082,7 +1082,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
/* See if it is just a regular IP */ /* See if it is just a regular IP */
else if (ip_addr(ipbuf, (int)(q-str), &pat.addr.addr4) == 0) else if (ip_addr(ipbuf, (int)(q-str), &pat.addr.addr4) == 0)
{ {
if (ipbufpfx) if (ipbufpfx[0])
{ {
memcpy(ipbuf, str, (int)(q-str)); memcpy(ipbuf, str, (int)(q-str));
ipbuf[(int)(q-str)] = '\0'; ipbuf[(int)(q-str)] = '\0';