diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | bus/bus.c | 5 | ||||
| -rw-r--r-- | bus/main.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-keyring.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 6 |
5 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2004-08-10 Olivier Andrieu <oliv__a@users.sourceforge.net> + + * bus/bus.c (process_config_first_time_only): get rid of an unused + DBusError that was causing a memoy leak (bug #989). + + * dbus/dbus-keyring.c, dbus/dbus-message.c: + fix compilation on Solaris/Forte C (bug #974) + + * bus/main.c (main): plug two minuscule memleaks. + 2004-08-10 Havoc Pennington <hp@redhat.com> * doc/dbus-tutorial.xml: add some more info on GLib bindings @@ -282,17 +282,14 @@ process_config_first_time_only (BusContext *context, { DBusString u; DBusStat stbuf; - DBusError tmp_error; - dbus_error_init (&tmp_error); _dbus_string_init_const (&u, pidfile); - if (_dbus_stat (&u, &stbuf, &tmp_error)) + if (_dbus_stat (&u, &stbuf, NULL)) { dbus_set_error (error, DBUS_ERROR_FAILED, "The pid file \"%s\" exists, if the message bus is not running, remove this file", pidfile); - dbus_error_free (&tmp_error); goto failed; } } @@ -351,6 +351,7 @@ main (int argc, char **argv) print_addr_fd = val; } } + _dbus_string_free (&addr_fd); print_pid_fd = -1; if (print_pid) @@ -372,6 +373,7 @@ main (int argc, char **argv) print_pid_fd = val; } } + _dbus_string_free (&pid_fd); if (!bus_selinux_init ()) { diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index d1444350..9877dca6 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -291,7 +291,7 @@ add_new_key (DBusKey **keys_p, DBusKey *new; DBusString bytes; int id; - unsigned long timestamp; + long timestamp; const unsigned char *s; dbus_bool_t retval; DBusKey *keys; diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index dc0a6a64..b191337e 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -5480,8 +5480,10 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader) return TRUE; } - header_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 4); - body_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 8); + header_len_unsigned = _dbus_unpack_uint32 (byte_order, + (const unsigned char *) header_data + 4); + body_len_unsigned = _dbus_unpack_uint32 (byte_order, + (const unsigned char *) header_data + 8); if (header_len_unsigned < 16) { |