From: Havoc Pennington <hp@redhat.com>
Date: Fri, 27 Apr 2007 17:58:46 +0000 (+0000)
Subject: 2007-04-27  Havoc Pennington  <hp@redhat.com>
X-Git-Tag: DBUS_1_0_3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6330489bbf1263d91dbed482f038efd1ce30ebf6;p=thirdparty%2Fdbus.git

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 9cc60cba3..41c7db9ee 100644
--- 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 7573e49fa..1c96d6e34 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;
     }