aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_local.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-08-13 17:32:44 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-08-13 17:32:44 +0000
commitbd0679195f59fd5ef7d94aea54011912c0b316fc (patch)
tree97db604054b44caec1b496f9dcf1813cd55c2343 /channels/chan_local.c
parent00f52a9872a88a380a800771b881f652f6f4126f (diff)
Add any missing locking calls
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1312 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
-rwxr-xr-xchannels/chan_local.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 7889d0fa3..9b60a0263 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -91,8 +91,13 @@ retrylock:
if (ast_mutex_trylock(&other->lock)) {
/* Failed to lock. Release main lock and try again */
ast_mutex_unlock(&p->lock);
- if (us)
- ast_mutex_unlock(&us->lock);
+ if (us) {
+ if (ast_mutex_unlock(&us->lock)) {
+ ast_log(LOG_WARNING, "%s wasn't locked while sending %d/%d\n",
+ us->name, f->frametype, f->subclass);
+ us = NULL;
+ }
+ }
/* Wait just a bit */
usleep(1);
/* Only we can destroy ourselves, so we can't disappear here */