Don't fixup if we haven't got PVT. Suggestion from Martin Vit on -dev mailing list...

by file's commit to chan_local.

"This shouldn't happen" ;-)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@47743 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 19ef6e0a2e5bc2967c01de1a6ee5f05593827990..1088e7c8acc1eb013ed3cf1a882ff2125765c7c1 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2619,6 +2619,11 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame)
 static int sip_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
 {
        struct sip_pvt *p = newchan->tech_pvt;
+       if (!p) {
+               ast_log(LOG_WARNING, "No pvt after masquerade. Strange things may happen\n");
+               return -1;
+       }
+
        ast_mutex_lock(&p->lock);
        if (p->owner != oldchan) {
                ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);