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

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/bus/activation.c b/bus/activation.c
index 3c3bd7a585fbe7f5a672e4eaf2d09ec3de7c933d..7b1ab063739ef3f349b0447f9c0810f5e7b36dd4 100644 (file)
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -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;
 
-  _dbus_string_free (&directory);
+  ret = TRUE;
 
-  return TRUE;
+out:
+  _dbus_string_free (&directory);
+  return ret;
 }
 
 #endif /* DBUS_ENABLE_EMBEDDED_TESTS */