RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-18 03:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tools: buf2ip6 must not modify output on failure

Browse Source 
Use a temporary output buffer to ensure we don't affect the output
on failure of inet_pton().
This commit is contained in:
Willy Tarreau 2013-12-12 11:29:39 +01:00
parent e3ded59706
commit 075415a4aa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/standard.c
View File

@ -1644,6 +1644,7 @@ unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret)
* or the number of chars read in case of success. Maybe this could be replaced * or the number of chars read in case of success. Maybe this could be replaced
* by one of the functions above. Also, apparently this function does not support * by one of the functions above. Also, apparently this function does not support
* hosts above 255 and requires exactly 4 octets. * hosts above 255 and requires exactly 4 octets.
* The destination is only modified on success.
*/ */
int buf2ip(const char *buf, size_t len, struct in_addr *dst) int buf2ip(const char *buf, size_t len, struct in_addr *dst)
{ {
@ -1695,10 +1696,12 @@ int buf2ip(const char *buf, size_t len, struct in_addr *dst)
/* This function converts the string in <buf> of the len <len> to /* This function converts the string in <buf> of the len <len> to
* struct in6_addr <dst> which must be allocated by the caller. * struct in6_addr <dst> which must be allocated by the caller.
* This function returns 1 in success case, otherwise zero. * This function returns 1 in success case, otherwise zero.
* The destination is only modified on success.
*/ */
int buf2ip6(const char *buf, size_t len, struct in6_addr *dst) int buf2ip6(const char *buf, size_t len, struct in6_addr *dst)
{ {
char null_term_ip6[INET6_ADDRSTRLEN + 1]; char null_term_ip6[INET6_ADDRSTRLEN + 1];
struct in6_addr out;
if (len > INET6_ADDRSTRLEN) if (len > INET6_ADDRSTRLEN)
return 0; return 0;
@ -1706,9 +1709,10 @@ int buf2ip6(const char *buf, size_t len, struct in6_addr *dst)
memcpy(null_term_ip6, buf, len); memcpy(null_term_ip6, buf, len);
null_term_ip6[len] = '\0'; null_term_ip6[len] = '\0';
if (!inet_pton(AF_INET6, null_term_ip6, dst)) if (!inet_pton(AF_INET6, null_term_ip6, &out))
return 0; return 0;
*dst = out;
return 1; return 1;
} }