[asterisk-commits] twilson: branch 1.6.1 r229016 - in /branches/1.6.1: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Nov  9 16:52:43 2009
New Revision: 229016

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229016
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_local.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_local.c?view=diff&rev=229016&r1=229015&r2=229016
==============================================================================
--- branches/1.6.1/channels/chan_local.c (original)
+++ branches/1.6.1/channels/chan_local.c Mon Nov  9 16:52:43 2009
@@ -176,6 +176,12 @@
 {
 	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);