kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

In the case of an ast_channel allocation failure, take the local_pvt out of the

Browse Source 
pvt list before destroying it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@105570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-03 17:16:53 +00:00
parent b3c0e042d4
commit 7f7dbcb11f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_local.c
View File

@@ -150,6 +150,9 @@ static int local_devicestate(void *data)
return AST_DEVICE_UNKNOWN; return AST_DEVICE_UNKNOWN;
} }
/*!
* \note Assumes the pvt is no longer in the pvts list
*/
static struct local_pvt *local_pvt_destroy(struct local_pvt *pvt) static struct local_pvt *local_pvt_destroy(struct local_pvt *pvt)
{ {
ast_mutex_destroy(&pvt->lock); ast_mutex_destroy(&pvt->lock);
@@ -673,8 +676,12 @@ static struct ast_channel *local_request(const char *type, int format, void *dat
/* Allocate a new private structure and then Asterisk channel */ /* Allocate a new private structure and then Asterisk channel */
if ((p = local_alloc(data, format))) { if ((p = local_alloc(data, format))) {
if (!(chan = local_new(p, AST_STATE_DOWN))) if (!(chan = local_new(p, AST_STATE_DOWN))) {
AST_LIST_LOCK(&locals);
AST_LIST_REMOVE(&locals, p, list);
AST_LIST_UNLOCK(&locals);
p = local_pvt_destroy(p); p = local_pvt_destroy(p);
}
} }
return chan; return chan;