From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 15 Jul 2010 13:52:32 +0000 (+0000)
Subject: Merged revisions 276653 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41af8a2fb7e9cac157177a8401aad7ac1b9b74ce;p=thirdparty%2Fasterisk.git

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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@276654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index 71081bde13..17811d5af1 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3604,7 +3604,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
 		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 {