[asterisk-commits] dvossel: trunk r316335 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue May  3 17:07:18 2011
New Revision: 316335

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316335
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=316335&r1=316334&r2=316335
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue May  3 17:07:18 2011
@@ -4323,7 +4323,7 @@
 		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;
 		}