summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-01-29 19:03:01 +0000
committerJoshua Colp <jcolp@digium.com>2007-01-29 19:03:01 +0000
commit6a7f296fafb10b1755858bde59d31076c3b0d352 (patch)
tree2abb1a5fd79f5bbd17794837a0770c1c51b4f639 /apps
parent690cf58f7a735118d06e46e690344e944a89f79b (diff)
Merged revisions 52572 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r52572 | file | 2007-01-29 13:59:41 -0500 (Mon, 29 Jan 2007) | 2 lines Use ast_calloc instead of malloc. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ee041a050..b521a36c0 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2539,16 +2539,14 @@ static int inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
if (!vms_p) {
if(option_debug > 2)
ast_log (LOG_DEBUG,"Adding new vmstate for %s\n",vmu->imapuser);
- vms_p = (struct vm_state *)malloc(sizeof(struct vm_state));
+ if (!(vms_p = ast_calloc(1, sizeof(*vms_p))))
+ return -1;
ast_copy_string(vms_p->imapuser,vmu->imapuser, sizeof(vms_p->imapuser));
ast_copy_string(vms_p->username, mailboxnc, sizeof(vms_p->username)); /* save for access from interactive entry point */
vms_p->mailstream = NIL; /* save for access from interactive entry point */
if(option_debug > 2)
ast_log (LOG_DEBUG,"Copied %s to %s\n",vmu->imapuser,vms_p->imapuser);
- vms_p->quota_limit = 0;
- vms_p->quota_usage = 0;
vms_p->updated = 1;
- vms_p->interactive = 0;
/* set mailbox to INBOX! */
ast_copy_string(vms_p->curbox, mbox(0), sizeof(vms_p->curbox));
init_vm_state(vms_p);