diff options
author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-11 15:01:11 +0100 |
---|---|---|
committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-11 15:01:11 +0100 |
commit | 1ca1bd2c536e75c94144842c84cb724b1d96c505 (patch) | |
tree | 3614c6461306d638b7ba4f4e7b167d62b46ebc47 /bus | |
parent | d8569ac647da4d62c7a251d8e809f2d545a77837 (diff) | |
download | dbus-1ca1bd2c536e75c94144842c84cb724b1d96c505.tar.gz |
Revert "Fix memory leaks in bus_activation_service_reload_test() in case of errors."
This reverts commit d8569ac647da4d62c7a251d8e809f2d545a77837.
Diffstat (limited to 'bus')
-rw-r--r-- | bus/activation.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bus/activation.c b/bus/activation.c index 7b1ab063..3c3bd7a5 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -2593,7 +2593,6 @@ 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; @@ -2601,14 +2600,16 @@ bus_activation_service_reload_test (const DBusString *test_data_dir) tmp = _dbus_get_tmpdir (); if (tmp == NULL) - goto out; + return FALSE; if (!_dbus_string_append (&directory, tmp)) - goto out; + return FALSE; if (!_dbus_string_append (&directory, "/dbus-reload-test-") || !_dbus_generate_random_ascii (&directory, 6, NULL)) - goto out; + { + return FALSE; + } /* Do normal tests */ if (!init_service_reload_test (&directory)) @@ -2630,13 +2631,11 @@ bus_activation_service_reload_test (const DBusString *test_data_dir) /* Cleanup test directory */ if (!cleanup_service_reload_test (&directory)) - goto out; - - ret = TRUE; + return FALSE; -out: _dbus_string_free (&directory); - return ret; + + return TRUE; } #endif /* DBUS_ENABLE_EMBEDDED_TESTS */ |