[svn-commits] mmichelson: trunk r67808 - in /trunk: ./ apps/app_voicemail.c

[svn-commits at lists.digium.com]

Author: mmichelson
Date: Wed Jun  6 14:46:41 2007
New Revision: 67808

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67808
Log:
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).


........

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=67808&r1=67807&r2=67808
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Jun  6 14:46:41 2007
@@ -5032,11 +5032,13 @@
 	}
 	ast_unlock_path(vms->curdir);
 #else
-	for (x=0;x < vmu->maxmsg;x++) { 
-		if (vms->deleted[x]) { 
-			if(option_debug > 2)
-				ast_log(LOG_DEBUG,"IMAP delete of %d\n",x);
-			IMAP_DELETE(vms->curdir, x, vms->fn, vms);
+	if (vms->deleted) {
+		for (x=0;x < vmu->maxmsg;x++) { 
+			if (vms->deleted[x]) { 
+				if(option_debug > 2)
+					ast_log(LOG_DEBUG,"IMAP delete of %d\n",x);
+				IMAP_DELETE(vms->curdir, x, vms->fn, vms);
+			}
 		}
 	}
 #endif