Merged revisions 238835 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r238835 | jpeeler | 2010-01-08 17:30:55 -0600 (Fri, 08 Jan 2010) | 11 lines

  Merged revisions 238834 via svnmerge from
  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/branches/1.6.1@238837 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index 5dc41288ebfe9ffef29ec49f38f009d13d78e9aa..1fdce077f5ab481bd189458b5168e4b6bd145fbd 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -799,7 +799,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);
        }