[asterisk-commits] file: trunk r48102 - in /trunk: ./ apps/app_voicemail.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Nov 28 22:28:21 2006
New Revision: 48102

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48102
Log:
Merged revisions 48101 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48101 | file | 2006-11-28 23:26:53 -0500 (Tue, 28 Nov 2006) | 2 lines

Don't crash if the mailstream was not created.

........

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

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

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=48102&r1=48101&r2=48102
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Nov 28 22:28:21 2006
@@ -4673,7 +4673,7 @@
 	if(option_debug > 2)
 		ast_log(LOG_DEBUG,"Before init_mailstream, user is %s\n",vmu->imapuser);
 	ret = init_mailstream(vms, box);
-	if (ret != 0) {
+	if (ret != 0 || !vms->mailstream) {
 		ast_log (LOG_ERROR,"Could not initialize mailstream\n");
 		return -1;
 	}