diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-15 13:52:32 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-15 13:52:32 +0000 |
| commit | f59a876bed8305ee23612329fee95a9fc90d8df2 (patch) | |
| tree | 1bb87203f80caf2b047fff2eade84010fad6d45c /main | |
| parent | 19c90377b0739f40b66083b8125ef86330727678 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@276654 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 71081bde1..17811d5af 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 { |