mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-05 22:32:32 -07:00
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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@73727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
+19
-2
@@ -2994,8 +2994,25 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
|
||||
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;
|
||||
if (option_debug > 2)
|
||||
ast_log(LOG_DEBUG, "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;
|
||||
if (option_debug > 2)
|
||||
|
||||
Reference in New Issue
Block a user