From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 2 Mar 2009 22:58:18 +0000 (+0000)
Subject: Ensure that only one thread is calling ast_settimeout() on a channel at a time.
X-Git-Tag: 1.4.24-rc1~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6706e0be242085d1041e17865ef1c17d14c04831;p=thirdparty%2Fasterisk.git

Ensure that only one thread is calling ast_settimeout() on a channel at a time.

For example, with an IAX2 channel, you can have both the channel thread and the
chan_iax2 processing threads calling this function, and doing so twice at the
same time is a bad thing.

(Found in a debugging session with dvossel and mmichelson)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@179461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index 25d45ec0d9..33f7558f78 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1839,6 +1839,7 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *d
 {
 	int res = -1;
 #ifdef HAVE_DAHDI
+	ast_channel_lock(c);
 	if (c->timingfd > -1) {
 		if (!func) {
 			samples = 0;
@@ -1850,6 +1851,7 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *d
 		c->timingfunc = func;
 		c->timingdata = data;
 	}
+	ast_channel_unlock(c);
 #endif	
 	return res;
 }