Merge "AST-2018-005: Add a check for NULL tdata in ast_sip_failover_request"

8 years ago · 121cbc98cb
parent 86c75af860 c53d8dcb68
commit 121cbc98cb
1 changed files with 2 additions and 1 deletions
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@ -4173,7 +4173,8 @@ int ast_sip_failover_request(pjsip_tx_data *tdata)
 {
 	pjsip_via_hdr *via;

-	if (!tdata->dest_info.addr.count || (tdata->dest_info.cur_addr == tdata->dest_info.addr.count - 1)) {
+	if (!tdata || !tdata->dest_info.addr.count
+		|| (tdata->dest_info.cur_addr == tdata->dest_info.addr.count - 1)) {
 		/* No more addresses to try */
 		return 0;
 	}