diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-11-16 13:56:49 -0600 |
|---|---|---|
| committer | Matt Jordan <mjordan@digium.com> | 2015-11-16 14:09:55 -0600 |
| commit | a83e426e9105882e03f2d84a7ff03436bd76b235 (patch) | |
| tree | ab36dbe19cd329765737af8c7b960e9ea61cfa6b | |
| parent | a1fcf6f7b28caf8e2f9b808449c86515e2ef90c4 (diff) | |
res/res_pjsip: Fix off nominal crash with requests that fail and have a timer
When a request is sent using pjsip_endpt_send_request and fails, a condition
exists where the request wrapper, which is an AO2 object, may be de-ref'd
more times than it should. This occurs when the request's callback is called,
and, in the callback, the timer on the PJSIP heap is cancelled. When that
occurs, the request wrapper's lifetime is decremented. When
pjsip_endpt_send_request fails, we unilaterally decrement the lifetime of
the request wrapper again, even though we've already cancelled the reference
associated with the timer.
This patch checks the return result of pj_timer_heap_cancel_if_active before
removing the reference associated with the timer. We now only decrement it
in this case if a timer is cancelled as a result of the function call.
Change-Id: I21332343a1a019c1117076f9bf2df27be2850102
| -rw-r--r-- | res/res_pjsip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 9d0540d42..a4748d20e 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -3151,9 +3151,11 @@ static pj_status_t endpt_send_request(struct ast_sip_endpoint *endpoint, char errmsg[PJ_ERR_MSG_SIZE]; if (timeout > 0) { - pj_timer_heap_cancel_if_active(pjsip_endpt_get_timer_heap(endpt), + int timers_cancelled = pj_timer_heap_cancel_if_active(pjsip_endpt_get_timer_heap(endpt), req_wrapper->timeout_timer, TIMER_INACTIVE); - ao2_ref(req_wrapper, -1); + if (timers_cancelled > 0) { + ao2_ref(req_wrapper, -1); + } } /* Complain of failure to send the request. */ |