From 15e1d6730acf334b0fbc466eb894e72080ca1845 Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 28 Aug 2008 09:40:56 +0000 Subject: Correct jack_controller_create and jackctl_server_create. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2829 0c269be4-1314-0410-8aa9-9f06e86f4224 --- linux/dbus/controller.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'linux') diff --git a/linux/dbus/controller.c b/linux/dbus/controller.c index d6d91dd2..47367ecc 100644 --- a/linux/dbus/controller.c +++ b/linux/dbus/controller.c @@ -298,7 +298,7 @@ jack_controller_create( if (controller_ptr->internal_names == NULL) { jack_error("Ran out of memory trying to allocate internals names array"); - goto fail_destroy_server; + goto fail_free_driver_names_array; } internal_name_target = controller_ptr->internal_names; @@ -320,17 +320,19 @@ jack_controller_create( &controller_ptr->dbus_descriptor)) { jack_error("Ran out of memory trying to register D-Bus object path"); - goto fail_free_names_array; + goto fail_free_internal_names_array; } jack_controller_settings_load(controller_ptr); return controller_ptr; -fail_free_names_array: - free(controller_ptr->driver_names); +fail_free_internal_names_array: free(controller_ptr->internal_names); +fail_free_driver_names_array: + free(controller_ptr->driver_names); + fail_destroy_server: jackctl_server_destroy(controller_ptr->server); -- cgit v1.2.1