[asterisk-commits] lmadsen: tag 1.8.8.0-rc4 r345542 - /tags/1.8.8.0-rc4/channels/chan_sip.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Nov 16 13:07:59 CST 2011


Author: lmadsen
Date: Wed Nov 16 13:07:57 2011
New Revision: 345542

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=345542
Log:
Merge changes from 1.8 branch. Revision 345063.

Modified:
    tags/1.8.8.0-rc4/channels/chan_sip.c

Modified: tags/1.8.8.0-rc4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc4/channels/chan_sip.c?view=diff&rev=345542&r1=345541&r2=345542
==============================================================================
--- tags/1.8.8.0-rc4/channels/chan_sip.c (original)
+++ tags/1.8.8.0-rc4/channels/chan_sip.c Wed Nov 16 13:07:57 2011
@@ -25040,11 +25040,13 @@
 	/* Called with peerl lock, but releases it */
 	struct sip_pvt *p;
 	int newmsgs = 0, oldmsgs = 0;
-	const char *vmexten;
+	const char *vmexten = NULL;
 
 	ao2_lock(peer);
 
-	vmexten = ast_strdupa(peer->vmexten);
+	if (peer->vmexten) {
+		vmexten = ast_strdupa(peer->vmexten);
+	}
 
 	if (ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY) && !peer->mwipvt) {
 		ao2_unlock(peer);




More information about the asterisk-commits mailing list