summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2009-09-10 20:52:57 +0000
committerJeff Peeler <jpeeler@digium.com>2009-09-10 20:52:57 +0000
commitf558f01a819c98875b272ed54672f94e2d36e088 (patch)
treedfd3d2daa2cae283a6e98093a88f916d572cb6fa
parent5561ba19aa8ebb0be8a74f291ebaf0805f8cbf29 (diff)
Fix crash during attended transfer over PRI.
The owner pointers in the sig_pri_chan structure were not getting updated in dahdi_fixup. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@217804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_dahdi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b78c6aa72..c2b19fdc5 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6315,7 +6315,15 @@ static int dahdi_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
if (analog_lib_handles(p->sig, p->radio, p->oprmode)) {
analog_fixup(oldchan, newchan, p->sig_pvt);
+ }
+#ifdef HAVE_PRI
+ else if (dahdi_sig_pri_lib_handles(p->sig)) {
+ struct sig_pri_chan *pchan = p->sig_pvt;
+ if (pchan->owner == oldchan) {
+ pchan->owner = newchan;
+ }
}
+#endif
update_conf(p);
ast_mutex_unlock(&p->lock);