mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
do not dereference p if we know it is NULL.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -14332,7 +14332,10 @@ retrylock:
|
||||
|
||||
/* Find the active SIP dialog or create a new one */
|
||||
p = find_call(&req, &sin, req.method); /* returns p locked */
|
||||
if (p) {
|
||||
if (p == NULL) {
|
||||
if (option_debug)
|
||||
ast_log(LOG_DEBUG, "Invalid SIP message - rejected , no callid, len %d\n", req.len);
|
||||
} else {
|
||||
/* Go ahead and lock the owner if it has one -- we may need it */
|
||||
/* becaues this is deadlock-prone, we need to try and unlock if failed */
|
||||
if (p->owner && ast_channel_trylock(p->owner)) {
|
||||
@@ -14368,9 +14371,6 @@ retrylock:
|
||||
if (p->owner && !nounlock)
|
||||
ast_channel_unlock(p->owner);
|
||||
ast_mutex_unlock(&p->lock);
|
||||
} else {
|
||||
if (option_debug)
|
||||
ast_log(LOG_DEBUG, "Invalid SIP message - rejected , bad request: %-70.70s\n", p->callid[0] ? p->callid : "<no callid>");
|
||||
}
|
||||
ast_mutex_unlock(&netlock);
|
||||
if (recount)
|
||||
|
Reference in New Issue
Block a user