From c024569f28bd010810db80ccd7fcc090c075f3cf Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 16 Jul 2006 19:35:09 +0000
Subject: [PATCH] malloc + memset to ast_calloc
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
manager.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
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;
--
GitLab