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 71081bde13c466f3777adbb7c8d7050686c1c57b..17811d5af1bcb865aac9d6d6379c9d67195cce5d 100644 (file)
--- 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 {