diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-03 17:17:27 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-03 17:17:27 +0000 |
commit | 64ddee2d6709fa1c94ba8ad1c6cb526162af3253 (patch) | |
tree | 3dd64e2a2d9e1c3d46707ca2cc9bd38bac46908c /channels/chan_local.c | |
parent | 5a5b389526d8b6a65251e3b56fe8377312f3cf3f (diff) |
Merged revisions 105570 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r105570 | russell | 2008-03-03 11:16:53 -0600 (Mon, 03 Mar 2008) | 3 lines
In the case of an ast_channel allocation failure, take the local_pvt out of the
pvt list before destroying it.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@105571 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
-rw-r--r-- | channels/chan_local.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 983c63825..ffd25bc33 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -157,6 +157,9 @@ static int local_devicestate(void *data) return res; } +/*! + * \note Assumes the pvt is no longer in the pvts list + */ static struct local_pvt *local_pvt_destroy(struct local_pvt *pvt) { ast_mutex_destroy(&pvt->lock); @@ -693,8 +696,12 @@ static struct ast_channel *local_request(const char *type, int format, void *dat /* Allocate a new private structure and then Asterisk channel */ 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); + } } return chan; |