kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast_calloc janitor (Inspired by issue 9860)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-06-03 06:10:27 +00:00
parent b1490716f6
commit ce9ec91897
7 changed files with 75 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_features.c
View File

@@ -387,7 +387,7 @@ static int features_hangup(struct ast_channel *ast)
ast_hangup(p->subchan);
ast_mutex_unlock(&p->lock);
ast_mutex_destroy(&p->lock);
free(p);
ast_free(p);
return 0;
}
ast_mutex_unlock(&p->lock);
@@ -428,9 +428,8 @@ static struct feature_pvt *features_alloc(char *data, int format)
ast_log(LOG_NOTICE, "Unable to allocate subchannel '%s/%s'\n", tech, dest);
return NULL;
}
tmp = malloc(sizeof(struct feature_pvt));
tmp = ast_calloc(1, sizeof(*tmp));
if (tmp) {
memset(tmp, 0, sizeof(struct feature_pvt));
for (x=0;x<3;x++)
init_sub(tmp->subs + x);
ast_mutex_init(&tmp->lock);
@@ -461,7 +460,7 @@ static struct ast_channel *features_new(struct feature_pvt *p, int state, int in
/* figure out what you want the name to be */
for (x=1;x<4;x++) {
if (b2)
free(b2);
ast_free(b2);
asprintf(&b2, "%s/%s-%d", p->tech, p->dest, x);
for (y=0;y<3;y++) {
if (y == index)
@@ -475,7 +474,7 @@ static struct ast_channel *features_new(struct feature_pvt *p, int state, int in
tmp = ast_channel_alloc(0, state, 0,0, "", "", "", 0, "Feature/%s", b2);
/* free up the name, it was copied into the channel name */
if (b2)
free(b2);
ast_free(b2);
if (!tmp) {
ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
return NULL;
@@ -566,7 +565,7 @@ static int unload_module(void)
if (p->owner)
ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD);
AST_LIST_REMOVE_CURRENT(&features, list);
free(p);
ast_free(p);
}
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&features);