From: Joshua Colp <jcolp@digium.com>
Date: Wed, 15 Nov 2006 22:32:51 +0000 (+0000)
Subject: Merged revisions 47712 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3948
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=176c7ca47c7e2614dffebddfbe26656857db2353;p=thirdparty%2Fasterisk.git

Merged revisions 47712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47712 | file | 2006-11-15 17:31:17 -0500 (Wed, 15 Nov 2006) | 10 lines

Merged revisions 47711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47711 | file | 2006-11-15 17:29:30 -0500 (Wed, 15 Nov 2006) | 2 lines

Make sure that the pvt structure exists before trying to do fixup on Local channels. (issue #7937 reported by mada123, fix by alamantia with mods by me)

........

................


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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index fe821363d0..e1028aa1e8 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -295,6 +295,10 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f)
 static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
 {
 	struct local_pvt *p = newchan->tech_pvt;
+
+	if (!p)
+		return -1;
+
 	ast_mutex_lock(&p->lock);
 
 	if ((p->owner != oldchan) && (p->chan != oldchan)) {