Merged revisions 157305 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Tue, 18 Nov 2008 18:31:08 +0000 (18:31 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 18 Nov 2008 18:31:08 +0000 (18:31 +0000)
commitd91f1df3e0f5270ca8b0d503e32ce466b6899f00
tree9d7c49be024ce0c889bfbb0d0299794cb862daec
parentf68bfa4ff35b6088f736def9e0c98ac181b1238b
Merged revisions 157305 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r157305 | mmichelson | 2008-11-18 12:25:55 -0600 (Tue, 18 Nov 2008) | 12 lines

Fix a crash in the end_bridge_callback of app_dial and
app_followme which would occur at the end of an attended
transfer. The error occurred because we initially stored
a pointer to an ast_channel which then was hung up due
to a masquerade.

This commit adds a "fixup" callback to the bridge_config
structure to allow for end_bridge_callback_data to be
changed in the case that a new channel pointer is needed
for the end_bridge_callback.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@157306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_dial.c
apps/app_followme.c
channels/chan_local.c
include/asterisk/channel.h
main/features.c