kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip: Fix pointer use after unref."

Browse Source
This commit is contained in:
zuul
2017-04-11 20:12:53 -05:00
committed by Gerrit Code Review
parent a0220877fa 5b4e2ec267
commit ecde4f1593
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_pjsip/config_transport.c
View File

@@ -286,15 +286,16 @@ static struct internal_state *find_internal_state_by_transport(const struct ast_
static struct ast_sip_transport_state *find_state_by_transport(const struct ast_sip_transport *transport)
{
struct internal_state *state;
struct ast_sip_transport_state *trans_state;
state = find_internal_state_by_transport(transport);
if (!state) {
return NULL;
}
ao2_bump(state->state);
ao2_cleanup(state);
trans_state = ao2_bump(state->state);
ao2_ref(state, -1);
return state->state;
return trans_state;
}
static int remove_temporary_state(void)
@@ -1297,22 +1298,22 @@ static struct ast_sip_cli_formatter_entry *cli_formatter;
struct ast_sip_transport_state *ast_sip_get_transport_state(const char *transport_id)
{
struct internal_state * state = NULL;
struct internal_state *state = NULL;
struct ast_sip_transport_state *trans_state;
if (!transport_states) {
return NULL;
}
state = ao2_find(transport_states, transport_id, OBJ_SEARCH_KEY);
if (!state || !state->state) {
ao2_cleanup(state);
if (!state) {
return NULL;
}
ao2_ref(state->state, +1);
trans_state = ao2_bump(state->state);
ao2_ref(state, -1);
return state->state;
return trans_state;
}
static int populate_transport_states(void *obj, void *arg, int flags)