summaryrefslogtreecommitdiff
path: root/dbus/dbus-string.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-18 17:45:34 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-18 17:45:34 +0000
commitd3fb6f35716ff1d6f6644dea2043d539007811de (patch)
tree46716f651f7e3d1ab87d427ac192de409aafb28a /dbus/dbus-string.c
parente0b284c7e38f0c002b2173d85ab89dc18700867c (diff)
2003-04-18 Havoc Pennington <hp@pobox.com>
* dbus/dbus-auth.c (record_mechanisms): memleak fixes * dbus/dbus-sysdeps.c (_dbus_string_save_to_file): fix some memleaks * dbus/dbus-keyring.c (add_new_key): fix a memleak, and on realloc be sure to update the pointer in the keyring * dbus/dbus-string.c (_dbus_string_zero): compensate for align offset to avoid writing to unallocated memory * dbus/dbus-auth.c (process_rejected): return FALSE if we fail to try the next mechanism, so we properly handle OOM * dbus/dbus-keyring.c (_dbus_keyring_new_homedir): fix double-free on OOM. (_dbus_keyring_new): fix OOM bug (_dbus_keyring_new_homedir): always set error; impose a maximum number of keys we'll load from the file, mostly to speed up the test suite and make its OOM checks more useful, but also for general sanity. * dbus/dbus-auth.c (process_error_server): reject authentication if we get an error from the client (process_cancel): on cancel, send REJECTED, per the spec (process_error_client): send CANCEL if we get an error from the server.
Diffstat (limited to 'dbus/dbus-string.c')
-rw-r--r--dbus/dbus-string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index b39b3a0d..71fc5fcc 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -2651,7 +2651,7 @@ _dbus_string_zero (DBusString *str)
{
DBUS_STRING_PREAMBLE (str);
- memset (real->str, '\0', real->allocated);
+ memset (real->str - real->align_offset, '\0', real->allocated);
}
/** @} */