From: Terry Wilson <twilson@digium.com>
Date: Mon, 9 Nov 2009 22:52:43 +0000 (+0000)
Subject: Merged revisions 229015 via svnmerge from
X-Git-Tag: 1.6.1.10-rc3~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42048030e0d0b573a86c611b544dd3b2c4b0dbca;p=thirdparty%2Fasterisk.git

Merged revisions 229015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r229015 | twilson | 2009-11-09 16:50:22 -0600 (Mon, 09 Nov 2009) | 8 lines

  Don't crash when bridge->tech_pvt == NULL

  This is a similar solution to what is in place for chan_agent

  (closes issue #16003)
  Reported by: atis
  Tested by: twilson
........


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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 141f89f5b7..b47b9a84a5 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -177,6 +177,12 @@ static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct
 	struct local_pvt *p = bridge->tech_pvt;
 	struct ast_channel *bridged = bridge;
 
+	if (!p) {
+		ast_debug(1, "Asked for bridged channel on '%s'/'%s', returning <none>\n",
+			chan->name, bridge->name);
+		return NULL;
+	}
+
 	ast_mutex_lock(&p->lock);
 
 	if (ast_test_flag(p, LOCAL_BRIDGE)) {