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.12-181-g1751705
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Oct 2010 13:38:35 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.12-181-g1751705
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 1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8 (commit)
from 9ff8d36f27aaf390fd074976cd2e867ba41f2588 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8
commit 1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Oct 11 09:38:00 2010 -0400
Linux getifaddrs might return entries with ->ifa_addr being NULL.
diff --git a/ChangeLog b/ChangeLog
index 8255ce0..8515aa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-11 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12093]
+ * sysdeps/unix/sysv/linux/check_pf.c (__check_pf): ->ifa_addr might
+ be NULL.
+
2010-10-07 Jakub Jelinek <jakub@redhat.com>
[BZ #3268]
diff --git a/NEWS b/NEWS
index f8482c4..832dd20 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.13
* The following bugs are resolved with this release:
3268, 7066, 10851, 11611, 11640, 11701, 11840, 11856, 11883, 11903, 11904,
- 11968, 11979, 12005, 12037, 12067, 12077, 12092, 12107
+ 11968, 11979, 12005, 12037, 12067, 12077, 12092, 12093, 12107
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index e694342..b789a32 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -1,5 +1,5 @@
/* Determine protocol families for which interfaces exist. Linux version.
- Copyright (C) 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -304,10 +304,13 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
struct ifaddrs *runp;
for (runp = ifa; runp != NULL; runp = runp->ifa_next)
- if (runp->ifa_addr->sa_family == PF_INET)
- *seen_ipv4 = true;
- else if (runp->ifa_addr->sa_family == PF_INET6)
- *seen_ipv6 = true;
+ if (runp->ifa_addr != NULL)
+ {
+ if (runp->ifa_addr->sa_family == PF_INET)
+ *seen_ipv4 = true;
+ else if (runp->ifa_addr->sa_family == PF_INET6)
+ *seen_ipv6 = true;
+ }
(void) freeifaddrs (ifa);
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
sysdeps/unix/sysv/linux/check_pf.c | 13 ++++++++-----
3 files changed, 15 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources