This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-28-ga7b8726
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Sep 2014 17:00:48 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-28-ga7b8726
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a7b872687073decdcc7effc2289877d69058aca9 (commit)
from 61fe374a44a92621e0b75ec1f011ff1fba6c2148 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a7b872687073decdcc7effc2289877d69058aca9
commit a7b872687073decdcc7effc2289877d69058aca9
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Sep 13 10:10:29 2014 +0200
Handle zero prefix length in getifaddrs (BZ #17371)
diff --git a/ChangeLog b/ChangeLog
index e316f8c..a40fb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-15 Andreas Schwab <schwab@linux-m68k.org>
+
+ [BZ #17371]
+ * sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs_internal): Fix
+ last change to handle zero prefix length.
+
2014-09-15 Siddhesh Poyarekar <siddhesh@redhat.com>
* sysdeps/posix/sysconf.c (__sysconf): Return -1 for
diff --git a/NEWS b/NEWS
index 680c265..2311590 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.21
* The following bugs are resolved with this release:
- 17363, 17370.
+ 17363, 17370, 17371.
Version 2.20
diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
index 2c04e17..a47b2ed 100644
--- a/sysdeps/unix/sysv/linux/ifaddrs.c
+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
@@ -770,20 +770,17 @@ getifaddrs_internal (struct ifaddrs **ifap)
if (cp != NULL)
{
- char c;
unsigned int preflen;
- if ((max_prefixlen > 0) &&
- (ifam->ifa_prefixlen > max_prefixlen))
+ if (ifam->ifa_prefixlen > max_prefixlen)
preflen = max_prefixlen;
else
preflen = ifam->ifa_prefixlen;
- for (i = 0; i < ((preflen - 1) / 8); i++)
+ for (i = 0; i < preflen / 8; i++)
*cp++ = 0xff;
- c = 0xff;
- c <<= ((128 - preflen) % 8);
- *cp = c;
+ if (preflen % 8)
+ *cp = 0xff << (8 - preflen % 8);
}
}
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
sysdeps/unix/sysv/linux/ifaddrs.c | 11 ++++-------
3 files changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
GNU C Library master sources