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

diff --git a/ChangeLog b/ChangeLog
index 9cc60cba327cebf00f8a40070a19ece4bf729be2..41c7db9ee5cc7a2961e8debf51433e174eb40130 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7573e49fab8febeaf82efe0a6f107f5dd7b9032d..1c96d6e3454502e2dbba86a04de4b7845b808cfc 100644 (file)
--- 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;
     }