diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-25 04:32:21 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-25 04:32:21 +0000 |
commit | f1080eefafa9e95ed4cc24c03dc8ed1d3a49e430 (patch) | |
tree | 8b862cce27a325e85febd6b20be1a366e02d32c9 /channel.c | |
parent | d1c369541e759b8cfd51fa0e40c92bbdb9ffb299 (diff) |
Merged revisions 11058 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r11058 | kpfleming | 2006-02-24 22:23:48 -0600 (Fri, 24 Feb 2006) | 2 lines
ensure that spy frame queueing is able to deal with translation failing for any reason (issue #6546)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@11060 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1213,7 +1213,12 @@ static void queue_frame_to_spies(struct ast_channel *chan, struct ast_frame *f, trans->last_format = f->subclass; } } - translated_frame = ast_translate(trans->path, f, 0); + if (!(translated_frame = ast_translate(trans->path, f, 0))) { + ast_log(LOG_ERROR, "Translation to %s failed, dropping frame for spies\n", + ast_getformatname(AST_FORMAT_SLINEAR)); + ast_mutex_unlock(&spy->lock); + break; + } } for (last = queue->head; last && last->next; last = last->next); |