[asterisk-commits] file: trunk r50728 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sat Jan 13 00:01:49 2007
New Revision: 50728

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50728
Log:
Merged revisions 50727 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50727 | file | 2007-01-13 01:00:24 -0500 (Sat, 13 Jan 2007) | 2 lines

Only write a frame out to the channel if one exists. There are cases where one may not and would therefore cause the channel driver to segfault. (issue #8434 reported by slimey)

........

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

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=50728&r1=50727&r2=50728
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Sat Jan 13 00:01:49 2007
@@ -2656,8 +2656,10 @@
 			/* and now put it through the regular translator */
 			f = (chan->writetrans) ? ast_translate(chan->writetrans, f, 0) : f;
 		}
-		
-		res = chan->tech->write(chan, f);
+		if (f)
+			res = chan->tech->write(chan, f);
+		else
+			res = 0;
 		break;
 	case AST_FRAME_NULL:
 	case AST_FRAME_IAX: