diff options
author | Havoc Pennington <hp@redhat.com> | 2005-08-09 21:36:55 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2005-08-09 21:36:55 +0000 |
commit | ae5ffd7fc39ea4406c5c643f6c6457bf9ab6b3ea (patch) | |
tree | ad9582f79a76ee55d63a3dfe742b5cc6cf9175ed /dbus | |
parent | b9042c1b107c6d43ddeeb16e6eaca3f555cff6e7 (diff) |
2005-08-09 Havoc Pennington <hp@redhat.com>
* dbus/dbus-errors.c: apply patch from Timo Teras to make a
malloc'd copy of the name parameter
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-errors.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index 287b4d7..d37c068 100644 --- a/dbus/dbus-errors.c +++ b/dbus/dbus-errors.c @@ -180,7 +180,10 @@ dbus_error_free (DBusError *error) real = (DBusRealError *)error; if (!real->const_message) - dbus_free (real->message); + { + dbus_free (real->name); + dbus_free (real->message); + } dbus_error_init (error); } @@ -306,7 +309,7 @@ dbus_error_is_set (const DBusError *error) * @todo should be called dbus_error_set() * * @param error the error. - * @param name the error name (not copied!!!) + * @param name the error name * @param format printf-style format string. */ void @@ -359,12 +362,17 @@ dbus_set_error (DBusError *error, _dbus_string_free (&str); goto nomem; } + _dbus_string_free (&str); - real->name = name; + real->name = _dbus_strdup (name); + if (real->name == NULL) + { + dbus_free (real->message); + real->message = NULL; + goto nomem; + } real->const_message = FALSE; - _dbus_string_free (&str); - return; nomem: |