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

Merge "app_voicemail/IMAP: IMAP access FATAL error: Out of memory"

This commit is contained in:
zuul 2016-04-11 14:21:21 -05:00 committed by Gerrit Code Review
parent 44fba00ca4 f9dab80816
commit c3339816f1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_voicemail.c
View File

@ -580,6 +580,8 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
#define INTRO "vm-intro"
#define MAX_MAIL_BODY_CONTENT_SIZE 134217728L // 128 Mbyte
#define MAXMSG 100
#define MAXMSGLIMIT 9999
@ -3624,8 +3626,8 @@ static int save_body(BODY *body, struct vm_state *vms, char *section, char *form
char *body_content;
char *body_decoded;
char *fn = is_intro ? vms->introfn : vms->fn;
unsigned long len;
unsigned long newlen;
unsigned long len = 0;
unsigned long newlen = 0;
char filename[256];
if (!body || body == NIL)
@ -3634,12 +3636,18 @@ static int save_body(BODY *body, struct vm_state *vms, char *section, char *form
ast_mutex_lock(&vms->lock);
body_content = mail_fetchbody(vms->mailstream, vms->msgArray[vms->curmsg], section, &len);
ast_mutex_unlock(&vms->lock);
if (body_content != NIL) {
if (len > MAX_MAIL_BODY_CONTENT_SIZE) {
ast_log(AST_LOG_ERROR,
"Msgno %ld, section %s. The body's content size %ld is huge (max %ld). User:%s, mailbox %s\n",
vms->msgArray[vms->curmsg], section, len, MAX_MAIL_BODY_CONTENT_SIZE, vms->imapuser, vms->username);
return -1;
}
if (body_content != NIL && len) {
snprintf(filename, sizeof(filename), "%s.%s", fn, format);
/* ast_debug(1, body_content); */
body_decoded = rfc822_base64((unsigned char *) body_content, len, &newlen);
/* If the body of the file is empty, return an error */
if (!newlen) {
if (!newlen || !body_decoded) {
return -1;
}
write_file(filename, (char *) body_decoded, newlen);