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

Merge "channel: Fix leak on successful call to chan->tech->requester." into 15

Browse Source
This commit is contained in:
Jenkins2
2017-08-07 09:28:01 -05:00
committed by Gerrit Code Review
parent 027f3f665b 3dbb1b9f48
commit 866dd2c816
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/channel.c
View File

@@ -6022,7 +6022,7 @@ static struct ast_channel *request_channel(const char *type, struct ast_format_c
const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *addr, int *cause) const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *addr, int *cause)
{ {
struct chanlist *chan; struct chanlist *chan;
struct ast_channel *c; struct ast_channel *c = NULL;
int res; int res;
int foo; int foo;
@@ -6063,9 +6063,6 @@ static struct ast_channel *request_channel(const char *type, struct ast_format_c
c = chan->tech->requester_with_stream_topology(type, topology, assignedids, requestor, addr, cause); c = chan->tech->requester_with_stream_topology(type, topology, assignedids, requestor, addr, cause);
ast_stream_topology_free(tmp_converted_topology); ast_stream_topology_free(tmp_converted_topology);
if (!c) {
return NULL;
}
} else if (chan->tech->requester) { } else if (chan->tech->requester) {
struct ast_format_cap *tmp_converted_cap = NULL; struct ast_format_cap *tmp_converted_cap = NULL;
struct ast_format_cap *tmp_cap; struct ast_format_cap *tmp_cap;
@@ -6116,12 +6113,10 @@ static struct ast_channel *request_channel(const char *type, struct ast_format_c
ao2_cleanup(tmp_converted_cap); ao2_cleanup(tmp_converted_cap);
c = chan->tech->requester(type, joint_cap, assignedids, requestor, addr, cause); c = chan->tech->requester(type, joint_cap, assignedids, requestor, addr, cause);
ao2_ref(joint_cap, -1);
}
if (!c) { if (!c) {
ao2_ref(joint_cap, -1);
return NULL;
}
} else {
return NULL; return NULL;
} }