diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | dbus/dbus-spawn.c | 7 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-userdb.c | 1 |
4 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,15 @@ +2004-08-28 Havoc Pennington <hp@redhat.com> + + * dbus/dbus-userdb.c (_dbus_is_console_user): remove unused variable + + More fixes from Steve Grubb + + * dbus/dbus-sysdeps.c (_dbus_connect_tcp_socket): fix fd leak + (_dbus_listen_tcp_socket): fix fd leak + + * dbus/dbus-spawn.c (read_pid, read_ints): move the "again:" for + EINTR to a bit lower in the code + 2004-08-26 Jon Trowbridge <trow@ximian.com> * bus/driver.c (bus_driver_handle_service_exists): Respond with diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index a7008303..03947cce 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -72,13 +72,13 @@ read_ints (int fd, { size_t chunk; size_t to_read; - - again: to_read = sizeof (int) * n_ints_in_buf - bytes; if (to_read == 0) break; + + again: chunk = read (fd, ((char*)buf) + bytes, @@ -128,11 +128,12 @@ read_pid (int fd, size_t chunk; size_t to_read; - again: to_read = sizeof (pid_t) - bytes; if (to_read == 0) break; + + again: chunk = read (fd, ((char*)buf) + bytes, diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 4af70931..629adb6b 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -622,6 +622,7 @@ _dbus_connect_tcp_socket (const char *host, _dbus_error_from_errno (errno), "Failed to lookup hostname: %s", host); + close (fd); return -1; } @@ -695,6 +696,7 @@ _dbus_listen_tcp_socket (const char *host, _dbus_error_from_errno (errno), "Failed to lookup hostname: %s", host); + close (listen_fd); return -1; } diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c index 833256c5..d8477cd2 100644 --- a/dbus/dbus-userdb.c +++ b/dbus/dbus-userdb.c @@ -413,7 +413,6 @@ _dbus_is_console_user (dbus_uid_t uid, DBusUserDatabase *db; const DBusUserInfo *info; - DBusString *console_file; dbus_bool_t result = FALSE; _dbus_user_database_lock_system (); |