kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 97973 via svnmerge from

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

........
r97973 | tilghman | 2008-01-10 17:08:36 -0600 (Thu, 10 Jan 2008) | 6 lines

1) When we get a translated frame out, clone it, because if the
translator pvt is freed before we use the frame, bad things happen.
2) Getting a failure from ast_sched_delete means that the schedule
ID is currently running.  Don't just ignore it.
(Closes issue #11698)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-01-10 23:40:13 +00:00
parent 3d47a43ac2
commit c88f243d8d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/chan_sip.c
View File

@@ -3044,11 +3044,18 @@ static void sip_destroy_peer(struct sip_peer *peer)
ast_variables_destroy(peer->chanvars);
peer->chanvars = NULL;
}
if (peer->expire > -1)
ast_sched_del(sched, peer->expire);
if (peer->pokeexpire > -1)
ast_sched_del(sched, peer->pokeexpire);
/* If the schedule delete fails, that means the schedule is currently
* running, which means we should wait for that thread to complete.
* Otherwise, there's a crashable race condition.
*
* NOTE: once peer is refcounted, this probably is no longer necessary.
*/
while (peer->expire > -1 && ast_sched_del(sched, peer->expire))
usleep(1);
while (peer->pokeexpire > -1 && ast_sched_del(sched, peer->pokeexpire))
usleep(1);
register_peer_exten(peer, FALSE);
ast_free_ha(peer->ha);
if (peer->selfdestruct)

5
main/translate.c
View File

@@ -225,7 +225,10 @@ struct ast_frame *ast_trans_frameout(struct ast_trans_pvt *pvt,
f->offset = AST_FRIENDLY_OFFSET;
f->src = pvt->t->name;
f->data = pvt->outbuf;
return f;
/* We must clone the frame, because the pvt could disappear
* the moment after we return (and unlock the source channel).
*/
return ast_frisolate(f);
}
static struct ast_frame *default_frameout(struct ast_trans_pvt *pvt)