Merged revisions 236981 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 30 Dec 2009 21:59:18 +0000 (21:59 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 30 Dec 2009 21:59:18 +0000 (21:59 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r236981 | tilghman | 2009-12-30 15:57:10 -0600 (Wed, 30 Dec 2009) | 9 lines

  Don't queue frames to channels that have no means to process them.
  (closes issue #15609)
   Reported by: aragon
   Patches:
         20091230__issue16521__1.4__chan_local_only.diff.txt uploaded by tilghman (license 14)
   Tested by: aragon

  Review: https://reviewboard.asterisk.org/r/452/
........

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

channels/chan_local.c

index 00c058d..b86c48c 100644 (file)
@@ -257,7 +257,9 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
        }
 
        if (other) {
-               ast_queue_frame(other, f);
+               if (other->pbx || other->_bridge) {
+                       ast_queue_frame(other, f);
+               } /* else the frame won't go anywhere */
                ast_channel_unlock(other);
        }