diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dbus/dbus-transport-unix.c | 6 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2006-09-14 Havoc Pennington <hp@redhat.com> + + * dbus/dbus-transport-unix.c (unix_do_iteration): fix a valgrind + complaint about accessing revents when poll returns 0, from Julian Seward. + 2006-09-14 John (J5) Palmieri <johnp@redhat.com> * Released 1.0 RC 1 (0.93) diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c index b2f7faa3..5536e923 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -1031,6 +1031,12 @@ unix_do_iteration (DBusTransport *transport, if (poll_res >= 0) { + if (poll_res == 0) + poll_fd.revents = 0; /* some concern that posix does not guarantee this; + * valgrind flags it as an error. though it probably + * is guaranteed on linux at least. + */ + if (poll_fd.revents & _DBUS_POLLERR) do_io_error (transport); else |