From: David Vossel <dvossel@digium.com>
Date: Tue, 3 May 2011 22:07:18 +0000 (+0000)
Subject: Merged revisions 316334 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1663
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4417923ce6e156cb6db59a04b95893abfe28778;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/channel.c b/main/channel.c
index 2b90ef4944..37e547914f 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;
 		}