diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 01:27:23 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 01:27:23 +0000 |
commit | 726b582e5012b8c3b1d56163dd8d7907687ee194 (patch) | |
tree | dec3e88fd8f21586299d1b2620847db9a925c9b4 /channels | |
parent | 446a31b256d23385d9a021b2b1c20aff5b0a4c5a (diff) |
Merged revisions 107292 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r107292 | twilson | 2008-03-10 20:09:46 -0500 (Mon, 10 Mar 2008) | 10 lines
Merged revisions 107290 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107290 | twilson | 2008-03-10 19:59:18 -0500 (Mon, 10 Mar 2008) | 2 lines
If we fail to alloc a channel, we should re-lock the pvt structure before returning.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107336 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 40645214a..248addc11 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5191,6 +5191,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit } if (!tmp) { ast_log(LOG_WARNING, "Unable to allocate AST channel structure for SIP channel\n"); + sip_pvt_lock(i); return NULL; } sip_pvt_lock(i); |