diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-15 13:51:11 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-15 13:51:11 +0000 |
commit | 3811ab62e0b31aca8e6736555839b050f4794b11 (patch) | |
tree | 34789cb79e181078863a259c1bd02048aa42086c /main | |
parent | 3f50182cd160460ac3e3c7278048f5a0383bb329 (diff) |
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/trunk@276653 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 65a4b7810..94d7d2616 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4553,7 +4553,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 { |