From 50765d9aa5e6d4edf95d48f572c38c2c3b9d1967 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Sat, 25 Feb 2006 04:32:21 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@11060 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/channel.c b/channel.c index c5bff12557..72bf9ae8d5 100644 --- a/channel.c +++ b/channel.c @@ -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);