From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 11 Jan 2006 18:40:42 +0000 (+0000)
Subject: replace malloc+memset with a call to ast_calloc, also removing the error
X-Git-Tag: 1.4.0-beta1~2989
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc13eb912069a0d479de78d063413f292c2ecfe;p=thirdparty%2Fasterisk.git

replace malloc+memset with a call to ast_calloc, also removing the error
message that is no longer necessary (issue #6205)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 59fc26eab6..0f3b157c38 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1359,13 +1359,10 @@ static struct adsi_script *compile_script(char *script)
 		ast_log(LOG_WARNING, "Can't open file '%s'\n", fn);
 		return NULL;
 	}
-	scr = malloc(sizeof(struct adsi_script));
-	if (!scr) {
+	if (!(scr = ast_calloc(1, sizeof(*scr)))) {
 		fclose(f);
-		ast_log(LOG_WARNING, "Out of memory loading script '%s'\n", fn);
 		return NULL;
 	}
-	memset(scr, 0, sizeof(struct adsi_script));
 	/* Create "main" as first subroutine */
 	getsubbyname(scr, "main", NULL, 0);
 	while(!feof(f)) {