mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-24 12:20:59 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MAJOR: fix a segfault on option http_proxy and url_ip acl

Browse Source 
url2sa() mistakenly uses "addr" as a reference. This causes a segfault when
option http_proxy or url_ip are used.

This bug was introduced in haproxy 1.5 and doesn't need to be backported.
This commit is contained in:
Cyril Bont 2012-10-24 23:47:47 +02:00 committed by Willy Tarreau
parent 4c01beb64b
commit 9ccf661225
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/standard.c
View File

@ -906,12 +906,12 @@ int url2sa(const char *url, int ulen, struct sockaddr_storage *addr)
* be warned this can slow down global daemon performances * be warned this can slow down global daemon performances
* while handling lagging dns responses. * while handling lagging dns responses.
*/ */
ret = url2ipv4(curr, &((struct sockaddr_in *)&addr)->sin_addr); ret = url2ipv4(curr, &((struct sockaddr_in *)addr)->sin_addr);
if (!ret) if (!ret)
return -1; return -1;
curr += ret; curr += ret;
((struct sockaddr_in *)addr)->sin_port = (*curr == ':') ? str2uic(++curr) : 80; ((struct sockaddr_in *)addr)->sin_port = (*curr == ':') ? str2uic(++curr) : 80;
((struct sockaddr_in *)addr)->sin_port = htons(((struct sockaddr_in *)&addr)->sin_port); ((struct sockaddr_in *)addr)->sin_port = htons(((struct sockaddr_in *)addr)->sin_port);
} }
return 0; return 0;
} }