diff options
author | Havoc Pennington <hp@redhat.com> | 2007-04-27 17:58:46 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2007-04-27 17:58:46 +0000 |
commit | 6330489bbf1263d91dbed482f038efd1ce30ebf6 (patch) | |
tree | 3a1879bb6275320ead2ae2a775415ae9d87bb076 | |
parent | 01dead5cdfe6777d27686d0a5e19fe776fefb64a (diff) |
2007-04-27 Havoc Pennington <hp@redhat.com>
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dbus/dbus-sysdeps-unix.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2007-04-27 Havoc Pennington <hp@redhat.com> + + * 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 <thiago@kde.org> * 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; } |