From: Joshua Colp <jcolp@digium.com>
Date: Thu, 5 Apr 2007 12:55:02 +0000 (+0000)
Subject: Merged revisions 60213 via svnmerge from
X-Git-Tag: 1.4.7.1~479
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a85156a737f814849177a6a875d974eeb93214fd;p=thirdparty%2Fasterisk.git

Merged revisions 60213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60213 | file | 2007-04-05 08:52:50 -0400 (Thu, 05 Apr 2007) | 2 lines

Only unlock our pvt and net locks if we are actually going to try to lock the owner again. (issue #9472 reported by zoa)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index bbccc6124e..58bbdb354a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14898,7 +14898,8 @@ static int sipsock_read(int *id, int fd, short events, void *ignore)
 		append_history(p, "Rx", "%s / %s / %s", req.data, get_header(&req, "CSeq"), req.rlPart2);
 
 	if (!lockretry) {
-		ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", S_OR(p->owner->name, "- no channel name ??? - "));
+		if (p->owner)
+			ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", S_OR(p->owner->name, "- no channel name ??? - "));
 		ast_log(LOG_ERROR, "SIP transaction failed: %s \n", p->callid);
 		if (req.method != SIP_ACK)
 			transmit_response(p, "503 Server error", &req);	/* We must respond according to RFC 3261 sec 12.2 */