Merged revisions 238834 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Fri, 8 Jan 2010 23:30:55 +0000 (23:30 +0000)
committerJeff Peeler <jpeeler@digium.com>
Fri, 8 Jan 2010 23:30:55 +0000 (23:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r238834 | jpeeler | 2010-01-08 17:28:37 -0600 (Fri, 08 Jan 2010) | 4 lines

  Stop a crash when no peer is passed to masq_park_call.

  (distantly related to issue #16406)
........

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

main/features.c

index 423ff27..3f20080 100644 (file)
@@ -991,7 +991,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
                peer = chan;
        }
 
-       if (!play_announcement && args == &park_args) {
+       if (peer && (!play_announcement && args == &park_args)) {
                args->orig_chan_name = ast_strdupa(peer->name);
        }