testing/glibc
SHA256
3
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 232954 from home:Andreas_Schwab:Factory

Browse Source 
- getaddrinfo-uninit-result.patch: fix parsing of getai result for
  IPv6-only request (bnc#876521)

OBS-URL: https://build.opensuse.org/request/show/232954
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=364
This commit is contained in:
Andreas Schwab 2014-05-07 15:06:20 +00:00 committed by Git OBS Bridge
parent 96e20a41d7
commit cc8c150f76
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
getaddrinfo-uninit-result.patch
View File

@ -5,18 +5,22 @@ Index: glibc-2.19/sysdeps/posix/getaddrinfo.c
=================================================================== ===================================================================
--- glibc-2.19.orig/sysdeps/posix/getaddrinfo.c --- glibc-2.19.orig/sysdeps/posix/getaddrinfo.c
+++ glibc-2.19/sysdeps/posix/getaddrinfo.c +++ glibc-2.19/sysdeps/posix/getaddrinfo.c
@@ -710,6 +710,14 @@ gaih_inet (const char *name, const struc @@ -712,6 +712,18 @@ gaih_inet (const char *name, const struc
struct gaih_addrtuple *addrfree = addrmem;
for (int i = 0; i < air->naddrs; ++i)
{ {
socklen_t size = (air->family[i] == AF_INET
? INADDRSZ : IN6ADDRSZ);
+
+ if (!((air->family[i] == AF_INET + if (!((air->family[i] == AF_INET
+ && req->ai_family == AF_INET6 + && req->ai_family == AF_INET6
+ && (req->ai_flags & AI_V4MAPPED) != 0) + && (req->ai_flags & AI_V4MAPPED) != 0)
+ || req->ai_family == AF_UNSPEC + || req->ai_family == AF_UNSPEC
+ || air->family[i] == req->ai_family)) + || air->family[i] == req->ai_family))
+ {
+ /* Skip over non-matching result. */ + /* Skip over non-matching result. */
+ addrs += size;
+ continue; + continue;
+ }
+ +
socklen_t size = (air->family[i] == AF_INET
? INADDRSZ : IN6ADDRSZ);
if (*pat == NULL) if (*pat == NULL)
{
*pat = addrfree++;

6
glibc-testsuite.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 7 10:13:24 UTC 2014 - schwab@suse.de
- getaddrinfo-uninit-result.patch: fix parsing of getai result for
IPv6-only request (bnc#876521)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 17 09:13:32 UTC 2014 - schwab@suse.de Thu Apr 17 09:13:32 UTC 2014 - schwab@suse.de

6
glibc-utils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 7 10:13:24 UTC 2014 - schwab@suse.de
- getaddrinfo-uninit-result.patch: fix parsing of getai result for
IPv6-only request (bnc#876521)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 17 09:13:32 UTC 2014 - schwab@suse.de Thu Apr 17 09:13:32 UTC 2014 - schwab@suse.de

6
glibc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 7 10:13:24 UTC 2014 - schwab@suse.de
- getaddrinfo-uninit-result.patch: fix parsing of getai result for
IPv6-only request (bnc#876521)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 17 09:13:32 UTC 2014 - schwab@suse.de Thu Apr 17 09:13:32 UTC 2014 - schwab@suse.de