From 4484e4e6d63e7fb729414d3bd62b0746e11d3a37 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 6 Feb 2009 19:30:29 +0000 Subject: [PATCH] Merged revisions 174041 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r174041 | file | 2009-02-06 15:28:53 -0400 (Fri, 06 Feb 2009) | 4 lines Don't subscribe to a mailbox on pseudo channels. It is futile. This solves an issue where duplicated pseudo channels would cause a crash because the first one would unsubscribe and the next one would also try to unsubscribe the same subscription. (closes issue #14322) Reported by: amessina ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174043 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 804e8235e5..76d79c026a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -9120,7 +9120,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, tmp->cid_ton = 0; ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name)); ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox)); - if (!ast_strlen_zero(tmp->mailbox)) { + if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) { char *mailbox, *context; mailbox = context = ast_strdupa(tmp->mailbox); strsep(&context, "@");