diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-06 16:36:17 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-06 16:36:17 +0000 |
| commit | 3af8d10370bc9c3bbbcd876eaa47eda9e82e6bb7 (patch) | |
| tree | 00108e2c5b29dad3cb568dc7b52739efe0c0e064 /apps/app_voicemail.c | |
| parent | 543e03214e44e1d763cd7558fe03a4be0956d644 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@73727 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 2c0ce53a8..cfb7074c7 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -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) |