[asterisk-commits] file: trunk r52580 - in /trunk: ./ apps/app_voicemail.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 29 13:03:01 2007
New Revision: 52580

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52580
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=52580&r1=52579&r2=52580
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Jan 29 13:03:01 2007
@@ -2539,16 +2539,14 @@
  	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);