From: Russell Bryant Date: Sun, 16 Jul 2006 19:35:09 +0000 (+0000) Subject: malloc + memset to ast_calloc X-Git-Tag: 1.4.0-beta1~570 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c024569f28bd010810db80ccd7fcc090c075f3cf;p=thirdparty%2Fasterisk.git malloc + memset to ast_calloc git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37733 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/manager.c b/manager.c index eea6b64691..028c619638 100644 --- a/manager.c +++ b/manager.c @@ -1909,12 +1909,9 @@ static void *accept_thread(void *ignore) ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY mode: %s\n", strerror(errno)); } } - s = malloc(sizeof(struct mansession)); - if (!s) { - ast_log(LOG_WARNING, "Failed to allocate management session: %s\n", strerror(errno)); + if (!(s = ast_calloc(1, sizeof(*s)))) continue; - } - memset(s, 0, sizeof(struct mansession)); + memcpy(&s->sin, &sin, sizeof(sin)); s->writetimeout = 100; s->waiting_thread = AST_PTHREADT_NULL;