diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-04-05 12:57:35 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-04-05 12:57:35 +0000 |
| commit | 95a7dc05092d9a90eb718a2ef3a7283d5de2f7b3 (patch) | |
| tree | 5b6614d09db8364bedb6c2fe004c185c55f6ccf1 /channels/chan_sip.c | |
| parent | 3a1d0a196be46394bddbd6277aace4fc1163dde6 (diff) | |
Merged revisions 60214 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r60214 | file | 2007-04-05 08:55:02 -0400 (Thu, 05 Apr 2007) | 10 lines
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/trunk@60215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index dbf54639e..97d5d2b19 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15576,7 +15576,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 */ |