Merge "res/res_pjsip: Fix off nominal crash with requests that fail and have a timer" into 13

11 years ago · 6c10d30d0e
parent 0843e6043e f62b642fe3
commit 6c10d30d0e
1 changed files with 4 additions and 2 deletions
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@ -3155,9 +3155,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. */