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 /NEWS | |
parent | 5fdb93a49c6b66f6461d4842821cb51d6e58658e (diff) | |
parent | 160fbc9ec110fc3aa691b86971b50ee8dc740783 (diff) | |
download | dbus-00243960027c202f2efe7f0c143c3a19aee3597b.tar.gz |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
-rw-r--r-- | NEWS | 3 |
1 files changed, 3 insertions, 0 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) |