diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-04-11 20:12:53 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-04-11 20:12:53 -0500 |
| commit | ecde4f15939fc9d6a33842ce6973f28d3a6ba200 (patch) | |
| tree | 6dc40605122610add5ab848229d47a9c5241da2a | |
| parent | a0220877faa05327f8f66bebc982166e5b78f29b (diff) | |
| parent | 5b4e2ec2677bff5c0e9814795e433d914f52bf7f (diff) | |
Merge "res_pjsip: Fix pointer use after unref."
| -rw-r--r-- | res/res_pjsip/config_transport.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index 3c41f175a..d180296f4 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -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) |