From 6330489bbf1263d91dbed482f038efd1ce30ebf6 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 27 Apr 2007 17:58:46 +0000 Subject: 2007-04-27 Havoc Pennington * dbus/dbus-sysdeps-unix.c (_dbus_open_socket): fix #10781 from Tobias Nygren, checking pointer to fd vs. 0 rather than checking the fd itself --- ChangeLog | 6 ++++++ dbus/dbus-sysdeps-unix.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cc60cba..41c7db9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-27 Havoc Pennington + + * dbus/dbus-sysdeps-unix.c (_dbus_open_socket): fix #10781 from + Tobias Nygren, checking pointer to fd vs. 0 rather than checking + the fd itself + 2007-03-03 Thiago Macieira * dbus/dbus-sysdeps-unix.c: capture the dbus-launch stderr diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 7573e49f..1c96d6e3 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -76,14 +76,14 @@ #endif static dbus_bool_t -_dbus_open_socket (int *fd, +_dbus_open_socket (int *fd_p, int domain, int type, int protocol, DBusError *error) { - *fd = socket (domain, type, protocol); - if (fd >= 0) + *fd_p = socket (domain, type, protocol); + if (*fd_p >= 0) { return TRUE; } -- cgit v1.2.1