[svn-commits] qwell: trunk r82395 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Sep 14 12:51:22 2007
New Revision: 82395

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82395
Log:
Merged revisions 82394 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82394 | qwell | 2007-09-14 12:48:05 -0500 (Fri, 14 Sep 2007) | 5 lines

If a channel does not have an owner, do not try to set a channel variable.
This will end up making the channel variable global, which is not right.

Closes issue #10720, patch by flefoll.

........

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

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=82395&r1=82394&r2=82395
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri Sep 14 12:51:22 2007
@@ -10138,7 +10138,7 @@
 									pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
 
 #ifdef SUPPORT_USERUSER
-						if (!ast_strlen_zero(e->hangup.useruserinfo)) {
+						if (pri->pvts[chanpos]->owner && !ast_strlen_zero(e->hangup.useruserinfo)) {
 							pbx_builtin_setvar_helper(pri->pvts[chanpos]->owner, "USERUSERINFO", e->hangup.useruserinfo);
 						}
 #endif