Browse Source

eliminate inadvertent use of client->graph_wait_fd (client->pollfd[WAIT].fd) on OS X - causes illegal write to memory

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3876 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.120.1
paul 15 years ago
parent
commit
22637219ce
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      libjack/client.c

+ 4
- 3
libjack/client.c View File

@@ -305,7 +305,6 @@ jack_client_alloc ()
client->request_fd = -1; client->request_fd = -1;
client->event_fd = -1; client->event_fd = -1;
client->upstream_is_jackd = 0; client->upstream_is_jackd = 0;
client->graph_wait_fd = -1;
client->graph_next_fd = -1; client->graph_next_fd = -1;
client->ports = NULL; client->ports = NULL;
client->ports_ext = NULL; client->ports_ext = NULL;
@@ -1539,12 +1538,14 @@ jack_client_core_wait (jack_client_t* client)
DEBUG ("event processing failed\n"); DEBUG ("event processing failed\n");
return 0; return 0;
} }

#ifndef JACK_USE_MACH_THREADS
if (client->graph_wait_fd >= 0 && if (client->graph_wait_fd >= 0 &&
(client->pollfd[WAIT_POLL_INDEX].revents & POLLIN)) { (client->pollfd[WAIT_POLL_INDEX].revents & POLLIN)) {
DEBUG ("time to run process()\n"); DEBUG ("time to run process()\n");
break; break;
} }
#endif
} }


if (control->dead || client->pollfd[EVENT_POLL_INDEX].revents & ~POLLIN) { if (control->dead || client->pollfd[EVENT_POLL_INDEX].revents & ~POLLIN) {
@@ -1778,7 +1779,7 @@ jack_client_thread_aux (void *arg)
jack_client_thread_suicide (client); jack_client_thread_suicide (client);
} }


static void *
static void*
jack_client_thread (void *arg) jack_client_thread (void *arg)
{ {
jack_client_t *client = (jack_client_t *) arg; jack_client_t *client = (jack_client_t *) arg;


Loading…
Cancel
Save