Merged revisions 67804 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67804 | mmichelson | 2007-06-06 14:26:55 -0500 (Wed, 06 Jun 2007) | 10 lines

Fix for Issue 9810. There was a segfault under a specific set of circumstances:

1. VoiceMailMain was configured in the dialplan with an extension as its argument
2. A message was left for this mailbox
3. Tried to call VoiceMailMain but hung up before entering password.

This was fixed by checking that a pointer was non-null prior to trying to dereference it.
(Issue 9810, reported by xmarksthespot, patched by Corydon76 with modifications by me).


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67808 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

@@ -5032,11 +5032,13 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
 	}
 	ast_unlock_path(vms->curdir);
 #else
-	for (x=0;x < vmu->maxmsg;x++) { 
+	if (vms->deleted) {
-		if (vms->deleted[x]) { 
+		for (x=0;x < vmu->maxmsg;x++) { 
-			if(option_debug > 2)
+			if (vms->deleted[x]) { 
-				ast_log(LOG_DEBUG,"IMAP delete of %d\n",x);
+				if(option_debug > 2)
-			IMAP_DELETE(vms->curdir, x, vms->fn, vms);
+					ast_log(LOG_DEBUG,"IMAP delete of %d\n",x);
+				IMAP_DELETE(vms->curdir, x, vms->fn, vms);
+			}
 		}
 	}
 #endif