[svn-commits] jpeeler: branch 1.6.2 r276654 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Jul 15 08:52:32 2010
New Revision: 276654

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

................
  r276653 | jpeeler | 2010-07-15 08:51:11 -0500 (Thu, 15 Jul 2010) | 9 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=276654&r1=276653&r2=276654
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Thu Jul 15 08:52:32 2010
@@ -3604,7 +3604,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 {