From 4f9d0e28e47bbd89c1e05bca9b417ad1f0e7b036 Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Thu, 5 Apr 2007 13:54:18 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60261 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 87fce1a847..2d8f85815e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11606,17 +11606,20 @@ retrylock: /* Go ahead and lock the owner if it has one -- we may need it */ if (p->owner && ast_mutex_trylock(&p->owner->lock)) { ast_log(LOG_DEBUG, "Failed to grab lock, trying again...\n"); - ast_mutex_unlock(&p->lock); - ast_mutex_unlock(&netlock); - /* Sleep for a very short amount of time */ - usleep(1); - if (--lockretry) + if (--lockretry) { + ast_mutex_unlock(&p->lock); + ast_mutex_unlock(&netlock); + usleep(1); goto retrylock; + } } if (!lockretry) { - ast_log(LOG_ERROR, "We could NOT get the channel lock for %s - Call ID %s! \n", p->owner->name, p->callid); + if (p->owner) + ast_log(LOG_ERROR, "We could NOT get the channel lock for %s - Call ID %s! \n", p->owner->name, p->callid); ast_log(LOG_ERROR, "SIP MESSAGE JUST IGNORED: %s \n", req.data); ast_log(LOG_ERROR, "BAD! BAD! BAD!\n"); + ast_mutex_unlock(&p->lock); + ast_mutex_unlock(&netlock); return 1; } memcpy(&p->recv, &sin, sizeof(p->recv)); -- 2.47.2