Merged revisions 70084 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 19 Jun 2007 19:15:03 +0000 (19:15 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 19 Jun 2007 19:15:03 +0000 (19:15 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r70084 | russell | 2007-06-19 14:13:45 -0500 (Tue, 19 Jun 2007) | 3 lines

Only attempt to queue a hangup on the owner channel if it actually exists.
(issue #9795, patch from zandbelt)

........

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

channels/chan_gtalk.c
channels/chan_jingle.c

index 537bc00..abd6d9d 100644 (file)
@@ -690,10 +690,10 @@ static int gtalk_hangup_farend(struct gtalk *client, ikspak *pak)
        if(!from)
                from = client->connection->jid->full;
 
-
        if (tmp) {
                tmp->alreadygone = 1;
-               ast_queue_hangup(tmp->owner);
+               if (tmp->owner)
+                       ast_queue_hangup(tmp->owner);
        } else
                ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
        gtalk_response(client, from, pak, NULL, NULL);
index 3035f8c..3790673 100644 (file)
@@ -571,7 +571,8 @@ static int jingle_hangup_farend(struct jingle *client, ikspak *pak)
 
        if (tmp) {
                tmp->alreadygone = 1;
-               ast_queue_hangup(tmp->owner);
+               if (tmp->owner)
+                       ast_queue_hangup(tmp->owner);
        } else
                ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
        jingle_response(client, pak, NULL, NULL);