Merged revisions 82394 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 14 Sep 2007 17:51:22 +0000 (17:51 +0000)
committerJason Parker <jparker@digium.com>
Fri, 14 Sep 2007 17:51:22 +0000 (17:51 +0000)
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.

........

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

channels/chan_zap.c

index 0291c05..e8d1ac3 100644 (file)
@@ -10138,7 +10138,7 @@ static void *pri_dchannel(void *vpri)
                                                                        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