kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-05 22:32:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_voicemail: Don't delete mailbox state unless mailbox is deleted" into 13

Browse Source
This commit is contained in:
Joshua C. Colp
2018-12-19 05:14:16 -06:00
committed by Gerrit Code Review
parent 1036959a49 e137086163
commit 5dc38c2fa9
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/app_voicemail.c
+14 -5
View File
@@ -2026,10 +2026,6 @@ static void free_user(struct ast_vm_user *vmu)
return;
}
if (!ast_strlen_zero(vmu->mailbox)) {
ast_delete_mwi_state_full(vmu->mailbox, vmu->context, NULL);
}
ast_free(vmu->email);
vmu->email = NULL;
ast_free(vmu->emailbody);
@@ -2042,6 +2038,19 @@ static void free_user(struct ast_vm_user *vmu)
}
}
static void free_user_final(struct ast_vm_user *vmu)
{
if (!vmu) {
return;
}
if (!ast_strlen_zero(vmu->mailbox)) {
ast_delete_mwi_state_full(vmu->mailbox, vmu->context, NULL);
}
free_user(vmu);
}
static int vm_allocate_dh(struct vm_state *vms, struct ast_vm_user *vmu, int count_msg) {
int arraysize = (vmu->maxmsg > count_msg ? vmu->maxmsg : count_msg);
@@ -13491,7 +13500,7 @@ static void free_vm_users(void)
AST_LIST_LOCK(&users);
while ((current = AST_LIST_REMOVE_HEAD(&users, list))) {
ast_set_flag(current, VM_ALLOCED);
free_user(current);
free_user_final(current);
}
AST_LIST_UNLOCK(&users);
}