[asterisk-commits] tilghman: trunk r154072 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Nov  3 16:28:12 2008
New Revision: 154072

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

........
  r154066 | tilghman | 2008-11-03 16:27:10 -0600 (Mon, 03 Nov 2008) | 5 lines
  
  Attempting to expunge a mailbox when the mailstream is NULL will crash Asterisk.
  (Closes issue #13829)
  Reported by: jaroth
  Patch by: me (modified jaroth's patch)
........

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=154072&r1=154071&r2=154072
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Nov  3 16:28:12 2008
@@ -9296,7 +9296,7 @@
 #ifdef IMAP_STORAGE
 	/* expunge message - use UID Expunge if supported on IMAP server*/
 	ast_debug(3, "*** Checking if we can expunge, deleted set to %d, expungeonhangup set to %d\n",deleted,expungeonhangup);
-	if (vmu && deleted == 1 && expungeonhangup == 1) {
+	if (vmu && deleted == 1 && expungeonhangup == 1 && vms.mailstream != NULL) {
 #ifdef HAVE_IMAP_TK2006
 		if (LEVELUIDPLUS (vms.mailstream)) {
 			mail_expunge_full(vms.mailstream,NIL,EX_UID);