kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undoes 310726 for further analysis

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@310733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-03-14 21:30:25 +00:00
parent 89eaad8ab8
commit 1a7d232a5a
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/channel.c
View File

@@ -2313,6 +2313,7 @@ static void ast_channel_destructor(void *obj)
struct ast_var_t *vardata;
struct ast_frame *f;
struct varshead *headp;
struct ast_datastore *datastore;
char device_name[AST_CHANNEL_NAME];
if (chan->name) {
@@ -2321,6 +2322,18 @@ static void ast_channel_destructor(void *obj)
ast_cel_check_retire_linkedid(chan);
}
/* Get rid of each of the data stores on the channel */
ast_channel_lock(chan);
while ((datastore = AST_LIST_REMOVE_HEAD(&chan->datastores, entry)))
/* Free the data store */
ast_datastore_free(datastore);
ast_channel_unlock(chan);
/* Lock and unlock the channel just to be sure nobody has it locked still
due to a reference that was stored in a datastore. (i.e. app_chanspy) */
ast_channel_lock(chan);
ast_channel_unlock(chan);
if (chan->tech_pvt) {
ast_log(LOG_WARNING, "Channel '%s' may not have been hung up properly\n", chan->name);
ast_free(chan->tech_pvt);
@@ -2671,7 +2684,6 @@ int ast_hangup(struct ast_channel *chan)
{
int res = 0;
char extra_str[64]; /* used for cel logging below */
struct ast_datastore *datastore;
/* Don't actually hang up a channel that will masquerade as someone else, or
if someone is going to masquerade as us */
@@ -2778,15 +2790,6 @@ int ast_hangup(struct ast_channel *chan)
ast_channel_unlock(chan);
}
/* Get rid of each of the data stores on the channel */
ast_channel_lock(chan);
while ((datastore = AST_LIST_REMOVE_HEAD(&chan->datastores, entry))) {
/* Free the data store */
ast_datastore_free(datastore);
}
ast_channel_unlock(chan);
chan = ast_channel_release(chan);
return res;