From dabfa94fdcbdfa75a3c1e74884b7ef6b26d062e1 Mon Sep 17 00:00:00 2001
From: "Eliel C. Sardanons" <eliels@gmail.com>
Date: Thu, 11 Jun 2009 15:40:03 +0000
Subject: [PATCH] Release the allocated channel decreasing the reference
counter.
When allocating the channel use ao2_ref(-1) to release it, instead of calling
ast_free().
Also avoid freeing structures inside that channel (on error) if they will be
released by the channel destructor being called if the reference counter reachs
0.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@200108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/channel.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/main/channel.c b/main/channel.c
index d877fc526e..e2d1a84816 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -812,27 +812,20 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char
if (!(tmp->sched = sched_context_create())) {
ast_log(LOG_WARNING, "Channel allocation failed: Unable to create schedule context\n");
- ast_free(tmp);
- return NULL;
+ return ast_channel_unref(tmp);
}
if ((ast_string_field_init(tmp, 128))) {
- sched_context_destroy(tmp->sched);
- ast_free(tmp);
- return NULL;
+ return ast_channel_unref(tmp);
}
if (cid_name) {
if (!(tmp->cid.cid_name = ast_strdup(cid_name))) {
- ast_string_field_free_memory(tmp);
- sched_context_destroy(tmp->sched);
return ast_channel_unref(tmp);
}
}
if (cid_num) {
if (!(tmp->cid.cid_num = ast_strdup(cid_num))) {
- ast_string_field_free_memory(tmp);
- sched_context_destroy(tmp->sched);
return ast_channel_unref(tmp);
}
}
--
GitLab