mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@88471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user