r3419 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-04-26 10:11:45 +0000 (Sun, 26 Apr 2009)
New Revision: 3419
Added:
glibc-package/trunk/debian/patches/any/local-getaddrinfo-interface.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* any/local-getaddrinfo-interface.diff: ignore addresses with no interface
assigned while sorting with rule 7. Closes: #521439.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-04-25 08:17:37 UTC (rev 3418)
+++ glibc-package/trunk/debian/changelog 2009-04-26 10:11:45 UTC (rev 3419)
@@ -10,6 +10,8 @@
<fpu_control.h> on EABI. Closes: #525261.
* any/cvs-iconv-utf16.diff: new patch from upstream to reject UTF-8-encoded
UTF-16 surrogates in iconv. Closes: #525299.
+ * any/local-getaddrinfo-interface.diff: ignore addresses with no interface
+ assigned while sorting with rule 7. Closes: #521439.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2450 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/any/local-getaddrinfo-interface.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-getaddrinfo-interface.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-getaddrinfo-interface.diff 2009-04-26 10:11:45 UTC (rev 3419)
@@ -0,0 +1,23 @@
+2009-04-26 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/posix/getaddrinfo.c (rfc3484_sort): don't assign native
+ result if the result has no associated interface.
+
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -1455,13 +1455,13 @@ rfc3484_sort (const void *p1, const void *p2, void *arg)
+
+ /* 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);
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-04-25 08:17:37 UTC (rev 3418)
+++ glibc-package/trunk/debian/patches/series 2009-04-26 10:11:45 UTC (rev 3419)
@@ -199,3 +199,4 @@
any/submitted-getaddrinfo-lo.diff
any/submitted-mount_h.diff
any/cvs-iconv-utf16.diff
+any/local-getaddrinfo-interface.diff
Reply to: