diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-28 11:38:33 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-28 11:38:33 +0100 |
| commit | 00243960027c202f2efe7f0c143c3a19aee3597b (patch) | |
| tree | 90cea90e702c6e381ed09788cce2adb7429149dc | |
| parent | 5fdb93a49c6b66f6461d4842821cb51d6e58658e (diff) | |
| parent | 160fbc9ec110fc3aa691b86971b50ee8dc740783 (diff) | |
| download | dbus-00243960027c202f2efe7f0c143c3a19aee3597b.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | dbus/dbus-errors.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -15,6 +15,9 @@ Fixes: • If malloc() returns NULL in _dbus_string_init() or similar, don't free an invalid pointer if the string is later freed (fd.o #65959, Chengwei Yang) +• If malloc() returns NULL in dbus_set_error(), don't va_end() a va_list + that was never va_start()ed (fd.o #66300, Chengwei Yang) + • Windows-specific: · Remove unavailable command-line options from 'dbus-daemon --help' (fd.o #42441, Ralf Habacker) diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index db3305b9..a0571a50 100644 --- a/dbus/dbus-errors.c +++ b/dbus/dbus-errors.c @@ -235,7 +235,7 @@ dbus_error_free (DBusError *error) * must ensure the name and message are global data that won't be * freed. You probably want dbus_set_error() instead, in most cases. * - * @param error the error.or #NULL + * @param error the error or #NULL * @param name the error name (not copied!!!) * @param message the error message (not copied!!!) */ @@ -379,7 +379,6 @@ dbus_set_error (DBusError *error, message_from_error (name))) { _dbus_string_free (&str); - va_end (args); goto nomem; } } |