You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.7 KiB
56 lines
1.7 KiB
Upstream commit: |
|
|
|
commit 894f3f1049135dcbeaab8f18690973663ef3147c |
|
Author: Allan McRae <allan@archlinux.org> |
|
Date: Fri Oct 25 14:25:38 2013 +1000 |
|
|
|
Fix incorrect getaddrinfo assertion trigger |
|
|
|
[BZ #9954] |
|
|
|
--- glibc-2.17-c758a686/sysdeps/posix/getaddrinfo.c |
|
+++ glibc-2.17-c758a686/sysdeps/posix/getaddrinfo.c |
|
@@ -1456,13 +1456,13 @@ |
|
|
|
/* Fill in the results in all the records. */ |
|
for (int i = 0; i < src->nresults; ++i) |
|
- if (src->results[i].index == a1_index) |
|
+ if (a1_index != -1 && src->results[i].index == a1_index) |
|
{ |
|
assert (src->results[i].native == -1 |
|
|| src->results[i].native == a1_native); |
|
src->results[i].native = a1_native; |
|
} |
|
- else if (src->results[i].index == a2_index) |
|
+ else if (a2_index != -1 && src->results[i].index == a2_index) |
|
{ |
|
assert (src->results[i].native == -1 |
|
|| src->results[i].native == a2_native); |
|
|
|
2009-03-15 Aurelien Jarno <aurelien@aurel32.net> |
|
|
|
* sysdeps/posix/getaddrinfo.c (getaddrinfo): correctly detect |
|
interface for all 127.X.Y.Z addresses. |
|
|
|
--- |
|
sysdeps/posix/getaddrinfo.c | 9 ++++++++- |
|
1 file changed, 8 insertions(+), 1 deletion(-) |
|
|
|
--- glibc-2.17-c758a686/sysdeps/posix/getaddrinfo.c |
|
+++ glibc-2.17-c758a686/sysdeps/posix/getaddrinfo.c |
|
@@ -2265,7 +2265,14 @@ |
|
tmp.addr[0] = 0; |
|
tmp.addr[1] = 0; |
|
tmp.addr[2] = htonl (0xffff); |
|
- tmp.addr[3] = sinp->sin_addr.s_addr; |
|
+ /* Special case for lo interface, the source address |
|
+ being possibly different than the interface |
|
+ address. */ |
|
+ if ((ntohl(sinp->sin_addr.s_addr) & 0xff000000) |
|
+ == 0x7f000000) |
|
+ tmp.addr[3] = htonl(0x7f000001); |
|
+ else |
|
+ tmp.addr[3] = sinp->sin_addr.s_addr; |
|
} |
|
else |
|
{
|
|
|