diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-04 22:38:13 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-04 22:38:13 +0000 |
| commit | d01bd3f7ace2fd034e63f6aa884a534450aa4ffd (patch) | |
| tree | 26e451020d5f848e4df9e7056ef81d24ae8a823d /main/channel.c | |
| parent | d6199734e23aac123cda4075ad33e575341d46fe (diff) | |
Rename ast_string_field_free_pool to ast_string_field_free_memory,
and ast_string_field_free_all to ast_string_field_reset_all
to avoid misuse (due to too similar names and an error in
documentation). Fix two related memory leaks in app_meetme.
No need to merge to trunk, different fix already applied there.
Not applicable to 1.2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@88471 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 9d9da80b4..d1ea7b438 100644 --- a/main/channel.c +++ b/main/channel.c @@ -776,7 +776,7 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_ if (needqueue) { if (pipe(tmp->alertpipe)) { ast_log(LOG_WARNING, "Channel allocation failed: Can't create alert pipe!\n"); - ast_string_field_free_pools(tmp); + ast_string_field_free_memory(tmp); free(tmp); return NULL; } else { @@ -1265,7 +1265,7 @@ void ast_channel_free(struct ast_channel *chan) /* Destroy the jitterbuffer */ ast_jb_destroy(chan); - ast_string_field_free_pools(chan); + ast_string_field_free_memory(chan); free(chan); AST_LIST_UNLOCK(&channels); |