diff options
| author | David Vossel <dvossel@digium.com> | 2011-05-03 22:07:18 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-05-03 22:07:18 +0000 |
| commit | f4417923ce6e156cb6db59a04b95893abfe28778 (patch) | |
| tree | 32a56c28250eddf584b40797fa580e2408e47edc /main | |
| parent | 277f9f46dc0418d5c85345e12a4d47ca11ebc89b (diff) | |
Merged revisions 316334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316334 | dvossel | 2011-05-03 17:05:59 -0500 (Tue, 03 May 2011) | 8 lines
Fixes framehook segfault on indicate
(closes issue #19215)
Reported by: irroot
Patches:
framehook_indicate.patch uploaded by irroot (license 52)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 2b90ef494..37e547914 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4323,7 +4323,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition, awesome_frame = ast_frdup(&frame); /* who knows what we will get back! the anticipation is killing me. */ - if (!(awesome_frame = ast_framehook_list_read_event(chan->framehooks, &frame))) { + if (!(awesome_frame = ast_framehook_list_read_event(chan->framehooks, awesome_frame))) { res = 0; goto indicate_cleanup; } |