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

Fix memory leaks in bus_activation_service_reload_test() in case of errors.

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: https://bugs.freedesktop.org/show_bug.cgi?id=92721
This commit is contained in:
Ralf Habacker 2015-11-09 13:38:59 +01:00
parent dcdb29a105
commit d8569ac647
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bus/activation.c
View file

@ -2593,6 +2593,7 @@ bus_activation_service_reload_test (const DBusString *test_data_dir)
{
DBusString directory;
const char *tmp;
dbus_bool_t ret = FALSE;
if (!_dbus_string_init (&directory))
return FALSE;
@ -2600,16 +2601,14 @@ bus_activation_service_reload_test (const DBusString *test_data_dir)
tmp = _dbus_get_tmpdir ();
if (tmp == NULL)
return FALSE;
goto out;
if (!_dbus_string_append (&directory, tmp))
return FALSE;
goto out;
if (!_dbus_string_append (&directory, "/dbus-reload-test-") ||
!_dbus_generate_random_ascii (&directory, 6, NULL))
{
return FALSE;
}
goto out;
/* Do normal tests */
if (!init_service_reload_test (&directory))
@ -2631,11 +2630,13 @@ bus_activation_service_reload_test (const DBusString *test_data_dir)
/* Cleanup test directory */
if (!cleanup_service_reload_test (&directory))
return FALSE;
goto out;
ret = TRUE;
out:
_dbus_string_free (&directory);
return TRUE;
return ret;
}
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */