[asterisk-commits] trunk r11060 - in /trunk: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Feb 24 22:32:21 2006
New Revision: 11060

URL: http://svn.digium.com/view/asterisk?rev=11060&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=11060&r1=11059&r2=11060&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Fri Feb 24 22:32:21 2006
@@ -1213,7 +1213,12 @@
 						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);