kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 182208 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r182208 | tilghman | 2009-03-16 10:39:15 -0500 (Mon, 16 Mar 2009) | 7 lines
  
  Fixup glare detection, to fix a memory leak of a local pvt structure.
  (closes issue #14656)
   Reported by: caspy
   Patches: 
         20090313__bug14656__2.diff.txt uploaded by tilghman (license 14)
   Tested by: caspy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-03-16 15:50:55 +00:00
parent 5308112806
commit 0bf4624643
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
channels/chan_local.c
View File

@@ -203,23 +203,17 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
/* Recalculate outbound channel */
other = isoutbound ? p->owner : p->chan;
/* Set glare detection */
ast_set_flag(p, LOCAL_GLARE_DETECT);
if (ast_test_flag(p, LOCAL_CANCEL_QUEUE)) {
/* We had a glare on the hangup. Forget all this business,
return and destroy p. */
ast_mutex_unlock(&p->lock);
p = local_pvt_destroy(p);
return -1;
}
if (!other) {
ast_clear_flag(p, LOCAL_GLARE_DETECT);
return 0;
}
/* do not queue frame if generator is on both local channels */
if (us && us->generator && other->generator)
if (us && us->generator && other->generator) {
return 0;
}
/* Set glare detection */
ast_set_flag(p, LOCAL_GLARE_DETECT);
/* Ensure that we have both channels locked */
while (other && ast_channel_trylock(other)) {
@@ -235,6 +229,17 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
other = isoutbound ? p->owner : p->chan;
}
/* Since glare detection only occurs within this function, and because
* a pvt flag cannot be set without having the pvt lock, this is the only
* location where we could detect a cancelling of the queue. */
if (ast_test_flag(p, LOCAL_CANCEL_QUEUE)) {
/* We had a glare on the hangup. Forget all this business,
return and destroy p. */
ast_mutex_unlock(&p->lock);
p = local_pvt_destroy(p);
return -1;
}
if (other) {
ast_queue_frame(other, f);
ast_channel_unlock(other);