automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@11088 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 1 deletions

diff --git a/channel.c b/channel.c
index 190c4a310..5aacefd21 100644
--- a/channel.c
+++ b/channel.c
@@ -1164,7 +1164,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);