[asterisk-commits] rmudgett: trunk r354497 - in /trunk: ./ apps/app_parkandannounce.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Feb  8 20:55:59 2012
New Revision: 354497

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=354497
Log:
Fix crash in ParkAndAnnounce.

Well, thats embarrasing.  I forgot to initialize the caller_id storage.

(closes issue ASTERISK-19311)
Reported by: tootai
Tested by: rmudgett
........

Merged revisions 354495 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 354496 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/apps/app_parkandannounce.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_parkandannounce.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_parkandannounce.c?view=diff&rev=354497&r1=354496&r2=354497
==============================================================================
--- trunk/apps/app_parkandannounce.c (original)
+++ trunk/apps/app_parkandannounce.c Wed Feb  8 20:55:59 2012
@@ -150,6 +150,7 @@
 	}
 
 	/* Save the CallerID because the masquerade turns chan into a ZOMBIE. */
+	ast_party_id_init(&caller_id);
 	ast_channel_lock(chan);
 	ast_party_id_copy(&caller_id, &chan->caller.id);
 	ast_channel_unlock(chan);