dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

fixes crash in chan_console 

There is a race condition between console_hangup()
and start_stream().  It is possible for console_hangup()
to be called and then the stream thread to begin after the hangup.
To avoid this a check in start_stream() to make sure the pvt-owner
still exists while the pvt lock is held is made.  If the owner
is gone that means the channel hung up and start_stream should
be aborted.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@262236 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
dvossel 2010-05-10 18:36:10 +00:00
parent f8fd696cc5
commit 26a012f4f3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_console.c
View File

@ -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;