kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 278261 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r278261 | tilghman | 2010-07-20 17:23:13 -0500 (Tue, 20 Jul 2010) | 7 lines
  
  Delete IMAP messages in reverse order, to ensure reordering after each expunge does not cause deletion of the wrong message.
  
  (closes issue #16350)
   Reported by: noahisaac
   Patches: 
         20100623__issue16350.diff.txt uploaded by tilghman (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-20 22:40:19 +00:00
parent 7066a7f233
commit ebf651105e
1 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/app_voicemail.c
View File

@@ -7556,11 +7556,10 @@ static int imap_delete_old_greeting (char *dir, struct vm_state *vms)
int i;
BODY* body;
file = strrchr(ast_strdupa(dir), '/');
if (file)
if (file) {
*file++ = '\0';
else {
} else {
ast_log(AST_LOG_ERROR, "Failed to procure file name from directory passed. You should never see this.\n");
return -1;
}
@@ -7587,8 +7586,7 @@ static int imap_delete_old_greeting (char *dir, struct vm_state *vms)
return 0;
}
#else
#ifndef IMAP_STORAGE
#elif !defined(IMAP_STORAGE)
static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box)
{
int count_msg, last_msg;
@@ -7604,10 +7602,11 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box)
create_dirpath(vms->curdir, sizeof(vms->curdir), vmu->context, vms->username, vms->curbox);
count_msg = count_messages(vmu, vms->curdir);
if (count_msg < 0)
if (count_msg < 0) {
return count_msg;
else
} else {
vms->lastmsg = count_msg - 1;
}
/*
The following test is needed in case sequencing gets messed up.
@@ -7624,13 +7623,13 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box)
last_msg = last_message_index(vmu, vms->curdir);
ast_unlock_path(vms->curdir);
if (last_msg < 0)
if (last_msg < 0) {
return last_msg;
}
return 0;
}
#endif
#endif
static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
{
@@ -7640,21 +7639,24 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
char fn2[PATH_MAX];
#endif
if (vms->lastmsg <= -1)
if (vms->lastmsg <= -1) {
goto done;
}
vms->curmsg = -1;
#ifndef IMAP_STORAGE
/* Get the deleted messages fixed */
if (vm_lock_path(vms->curdir))
if (vm_lock_path(vms->curdir)) {
return ERROR_LOCK_PATH;
}
for (x = 0; x < vmu->maxmsg; x++) {
if (!vms->deleted[x] && ((strcasecmp(vms->curbox, "INBOX") && strcasecmp(vms->curbox, "Urgent")) || !vms->heard[x] || (vms->heard[x] && !ast_test_flag(vmu, VM_MOVEHEARD)))) {
/* Save this message. It's not in INBOX or hasn't been heard */
make_file(vms->fn, sizeof(vms->fn), vms->curdir, x);
if (!EXISTS(vms->curdir, x, vms->fn, NULL))
if (!EXISTS(vms->curdir, x, vms->fn, NULL)) {
break;
}
vms->curmsg++;
make_file(fn2, sizeof(fn2), vms->curdir, vms->curmsg);
if (strcmp(vms->fn, fn2)) {
@@ -7683,22 +7685,26 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
/* If realtime storage enabled - we should explicitly delete this message,
cause RENAME() will overwrite files, but will keep duplicate records in RT-storage */
make_file(vms->fn, sizeof(vms->fn), vms->curdir, x);
if (EXISTS(vms->curdir, x, vms->fn, NULL))
if (EXISTS(vms->curdir, x, vms->fn, NULL)) {
DELETE(vms->curdir, x, vms->fn, vmu);
}
}
}
/* Delete ALL remaining messages */
nummsg = x - 1;
for (x = vms->curmsg + 1; x <= nummsg; x++) {
make_file(vms->fn, sizeof(vms->fn), vms->curdir, x);
if (EXISTS(vms->curdir, x, vms->fn, NULL))
if (EXISTS(vms->curdir, x, vms->fn, NULL)) {
DELETE(vms->curdir, x, vms->fn, vmu);
}
}
ast_unlock_path(vms->curdir);
#else
#else /* defined(IMAP_STORAGE) */
if (vms->deleted) {
for (x = 0; x < vmu->maxmsg; x++) {
/* Since we now expunge after each delete, deleting in reverse order
* ensures that no reordering occurs between each step. */
for (x = vmu->maxmsg - 1; x >= 0; x--) {
if (vms->deleted[x]) {
ast_debug(3, "IMAP delete of %d\n", x);
DELETE(vms->curdir, x, vms->fn, vmu);
@@ -7729,7 +7735,7 @@ static int vm_play_folder_name_gr(struct ast_channel *chan, char *box)
int cmd;
char *buf;
buf = alloca(strlen(box)+2);
buf = alloca(strlen(box) + 2);
strcpy(buf, box);
strcat(buf, "s");