[asterisk-commits] file: trunk r47713 - in /trunk: ./ channels/chan_local.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Nov 15 16:32:51 2006
New Revision: 47713

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

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=47713&r1=47712&r2=47713
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Wed Nov 15 16:32:51 2006
@@ -295,6 +295,10 @@
 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)) {