sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 89580 via svnmerge from 

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

........
r89580 | mmichelson | 2007-11-26 09:48:06 -0600 (Mon, 26 Nov 2007) | 6 lines

Revert vmu->email back to an empty string if it was empty when imap_store_file
was called. This prevents sending a duplicate e-mail. 

(closes issue #11204, reported by spditner, patched by me)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson 2007-11-26 15:50:37 +00:00
parent 867b734868
commit 0b120dac62
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_voicemail.c
View File

@ -2489,6 +2489,7 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
char tmp[80] = "/tmp/astmail-XXXXXX";
long len;
void *buf;
int tempcopy = 0;
STRING str;
/* Attach only the first format */
@ -2504,8 +2505,14 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
else
ast_copy_string (fn, dir, sizeof(fn));
if (ast_strlen_zero(vmu->email))
if (ast_strlen_zero(vmu->email)) {
/*we need the vmu->email to be set when we call make_email_file, but if we keep it set,
* a duplicate e-mail will be created. So at the end of this function, we will revert back to an empty
* string if tempcopy is 1
*/
ast_copy_string(vmu->email, vmu->imapuser, sizeof(vmu->email));
tempcopy = 1;
}
if (!strcmp(fmt, "wav49"))
fmt = "WAV";
@ -2515,6 +2522,8 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
command hangs */
if (!(p = vm_mkftemp(tmp))) {
ast_log(LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
if(tempcopy)
*(vmu->email) = '\0';
return -1;
}
@ -2529,6 +2538,8 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
rewind(p);
if (!(buf = ast_malloc(len+1))) {
ast_log(LOG_ERROR, "Can't allocate %ld bytes to read message\n", len+1);
if(tempcopy)
*(vmu->email) = '\0';
return -1;
}
fread(buf, len, 1, p);
@ -2542,6 +2553,10 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
unlink(tmp);
ast_free(buf);
ast_debug(3, "%s stored\n", fn);
if(tempcopy)
*(vmu->email) = '\0';
return 0;
}