diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-01-10 23:40:13 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-01-10 23:40:13 +0000 |
| commit | c88f243d8d6ca80f98cd36fd6c0ff17529766af4 (patch) | |
| tree | 6b06c71a82f742ae75791c9850be922da04663af /main | |
| parent | 3d47a43ac205b104a85f40624621471ea4fdb813 (diff) | |
Merged revisions 97973 via svnmerge from
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/translate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/translate.c b/main/translate.c index 1236ee0ee..1611385f5 100644 --- a/main/translate.c +++ b/main/translate.c @@ -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) |