[asterisk-commits] mmichelson: trunk r73728 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jul  6 11:39:11 2007
New Revision: 73728

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

........
r73727 | mmichelson | 2007-07-06 11:36:17 -0500 (Fri, 06 Jul 2007) | 8 lines

Fixing a rare case which causes voicemail to crash when compiled with IMAP storage.
inboxcount has the possibility of finding an "interactive" vm_state when no persistent "non-interactive"
vm_state exists for that mailbox. If this should happen when someone attempts to leave a message, it results in
a crash. This patch, along with my commit in revision 72670 fix issue 10053, reported by jaroth.

closes issue #10053


........

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=73728&r1=73727&r2=73728
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Jul  6 11:39:11 2007
@@ -3183,8 +3183,24 @@
 			ast_log(LOG_NOTICE,"Can not leave voicemail, unable to count messages\n");
 			return -1;
 		}
-		if((vms = get_vm_state_by_mailbox(ext,0)))  
-			vms->newmessages++; /*still need to increment new message count*/
+		if(!(vms = get_vm_state_by_mailbox(ext,0))) {
+		/*It is possible under certain circumstances that inboxcount did not create a vm_state when it was needed. This is a catchall which will
+		 * rarely be used*/
+			if (!(vms = ast_calloc(1, sizeof(*vms)))) {
+				ast_log(LOG_ERROR, "Couldn't allocate necessary space\n");
+				return -1;
+			}
+			ast_copy_string(vms->imapuser, vmu->imapuser, sizeof(vms->imapuser));
+			ast_copy_string(vms->username, ext, sizeof(vms->username));
+			vms->mailstream = NIL;
+			ast_debug(3, "Copied %s to %s\n", vmu->imapuser, vms->imapuser);
+			vms->updated=1;
+			ast_copy_string(vms->curbox, mbox(0), sizeof(vms->curbox));
+			init_vm_state(vms);
+			vmstate_insert(vms);
+			vms = get_vm_state_by_mailbox(ext,0);
+		}
+		vms->newmessages++;
 		
 		/* here is a big difference! We add one to it later */
 		msgnum = newmsgs + oldmsgs;