diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-24 03:09:48 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-24 03:09:48 +0000 |
| commit | 6895e3748692994e604488e115b8c822262304b3 (patch) | |
| tree | b89105a15b5725584a2bb122547faedb7a5f98fb | |
| parent | 217ac79e02e4ada9dadbc87278721afa59427fce (diff) | |
Merged revisions 46078 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46078 | tilghman | 2006-10-23 22:01:00 -0500 (Mon, 23 Oct 2006) | 3 lines
Pass through a frame if we don't know what it is, rather than trying to pass a
NULL, which will segfault a channel driver (Bug 8149)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46079 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 9a53205ce..65572d3e8 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2615,7 +2615,10 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) res = 0; break; default: - res = chan->tech->write(chan, f); + /* At this point, fr is the incoming frame and f is NULL. Channels do + * not expect to get NULL as a frame pointer and will segfault. Hence, + * we output the original frame passed in. */ + res = chan->tech->write(chan, fr); break; } |