[asterisk-commits] jpeeler: trunk r276653 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Jul 15 08:51:11 2010
New Revision: 276653

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

........
  r276652 | jpeeler | 2010-07-15 08:48:58 -0500 (Thu, 15 Jul 2010) | 2 lines
  
  In a perfect world, the frame source would never be NULL. In the meantime, don't crash when it is.
........

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://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=276653&r1=276652&r2=276653
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Jul 15 08:51:11 2010
@@ -4553,7 +4553,7 @@
 		res = 0;	/* XXX explain, why 0 ? */
 		goto done;
 	}
-	if (chan->generatordata && strcasecmp(fr->src, "ast_prod")) {
+	if (chan->generatordata && (!fr->src || strcasecmp(fr->src, "ast_prod"))) {
 		if (ast_test_flag(chan, AST_FLAG_WRITE_INT)) {
 				ast_deactivate_generator(chan);
 		} else {