From 88198692bf11c2b3e55b29ba445c9dc1c4956875 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Sep 2013 23:34:17 -0400 Subject: [PATCH] fix screw up caused by attempting to uuid_parse() a null string UUID in jack client arguments --- libjack/client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libjack/client.c b/libjack/client.c index c585f1b..aa5c063 100644 --- a/libjack/client.c +++ b/libjack/client.c @@ -773,9 +773,9 @@ server_connect (const char *server_name) if (connect (fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) { close (fd); + jack_error ("connect(2) call to %s failed (err=%s)", addr.sun_path, strerror (errno)); return -1; } - return fd; } @@ -1033,8 +1033,9 @@ jack_request_client (ClientType type, /* format connection request */ - if (va->sess_uuid) { + if (va->sess_uuid && strlen (va->sess_uuid)) { if (jack_uuid_parse (va->sess_uuid, req.uuid) != 0) { + jack_error ("Given UUID [%s] is not parseable", va->sess_uuid); goto fail; } } else { @@ -1105,6 +1106,7 @@ jack_request_client (ClientType type, return 0; fail: + jack_error ("attempt to connect to server failed"); if (*req_fd >= 0) { close (*req_fd); *req_fd = -1;