fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-15 02:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.6'

Browse source 
Conflicts:
	NEWS
This commit is contained in:
Simon McVittie 2013-06-20 13:24:41 +01:00
commit f2ea8ccc11
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -1,7 +1,10 @@
D-Bus 1.7.6 (UNRELEASED)
==
...
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)
D-Bus 1.7.4 (2013-06-13)
==

8
dbus/dbus-string.c
View file

@ -246,6 +246,14 @@ _dbus_string_free (DBusString *str)
if (real->constant)
return;
/* so it's safe if @p str returned by a failed
* _dbus_string_init call
* Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65959
*/
if (real->str == NULL)
return;
dbus_free (real->str - real->align_offset);
real->invalid = TRUE;