RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix return value for inet_pton in ipv6 failure cases 

in the case of input that does not match the expected form, the
correct return value is 0, not -1.
This commit is contained in:
Rich Felker 2013-10-19 22:36:30 -04:00
parent ebb4cc0fec
commit 38b9c02749
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/inet_pton.c
View File

@ -46,24 +46,24 @@ int inet_pton(int af, const char *restrict s, void *restrict a0)
if (!s[1]) break; if (!s[1]) break;
continue; continue;
} }
if (hexval(s[0])<0) return -1; if (hexval(s[0])<0) return 0;
while (s[0]=='0' && s[1]=='0') s++; while (s[0]=='0' && s[1]=='0') s++;
for (v=j=0; j<5 && (d=hexval(s[j]))>=0; j++) for (v=j=0; j<5 && (d=hexval(s[j]))>=0; j++)
v=16*v+d; v=16*v+d;
if (v > 65535) return -1; if (v > 65535) return 0;
ip[i] = v; ip[i] = v;
if (!s[j]) { if (!s[j]) {
if (brk<0 && i!=7) return -1; if (brk<0 && i!=7) return 0;
break; break;
} }
if (i<7) { if (i<7) {
if (s[j]==':') continue; if (s[j]==':') continue;
if (s[j]!='.') return -1; if (s[j]!='.') return 0;
need_v4=1; need_v4=1;
i++; i++;
break; break;
} }
return -1; return 0;
} }
if (brk>=0) { if (brk>=0) {
memmove(ip+brk+7-i, ip+brk, 2*(i+1-brk)); memmove(ip+brk+7-i, ip+brk, 2*(i+1-brk));
@ -73,6 +73,6 @@ int inet_pton(int af, const char *restrict s, void *restrict a0)
*a++ = ip[j]>>8; *a++ = ip[j]>>8;
*a++ = ip[j]; *a++ = ip[j];
} }
if (need_v4 &&inet_pton(AF_INET, (void *)s, a-4) <= 0) return -1; if (need_v4 && inet_pton(AF_INET, (void *)s, a-4) <= 0) return 0;
return 1; return 1;
} }