summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2008-08-28 09:40:56 +0000
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2008-08-28 09:40:56 +0000
commit15e1d6730acf334b0fbc466eb894e72080ca1845 (patch)
tree6fe28a810e5f052369c47c75b1d464dcf98ec595 /linux
parent6ad125e50665ca4ae0c98f862ec5f5bcaaf90f05 (diff)
downloadjack2-15e1d6730acf334b0fbc466eb894e72080ca1845.tar.gz
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
Diffstat (limited to 'linux')
-rw-r--r--linux/dbus/controller.c10
1 files changed, 6 insertions, 4 deletions
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);