diff --git a/channels/chan_console.c b/channels/chan_console.c index 93a51ae4ebda08a740bdde25d2648f8b8d2c6c63..6c566e9c9e9b0829ab670a8537619aaeee8db5ff 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -277,6 +277,10 @@ static void *stream_monitor(void *data) res = Pa_ReadStream(pvt->stream, buf, sizeof(buf) / sizeof(int16_t)); pthread_testcancel(); + if (!pvt->owner) { + return NULL; + } + if (res == paNoError) ast_queue_frame(pvt->owner, &f); } @@ -352,7 +356,10 @@ static int start_stream(struct console_pvt *pvt) console_pvt_lock(pvt); - if (pvt->streamstate) + /* It is possible for console_hangup to be called before the + * stream is started, if this is the case pvt->owner will be NULL + * and start_stream should be aborted. */ + if (pvt->streamstate || !pvt->owner) goto return_unlock; pvt->streamstate = 1;