[Asterisk-code-review] pjsip transport events.c Crash on chan pjsip transport disco... (asterisk[13])

[Ross Beer]

Ross Beer has uploaded this change for review. ( https://gerrit.asterisk.org/8455


Change subject: pjsip_transport_events.c Crash on chan_pjsip transport disconnect
......................................................................

pjsip_transport_events.c Crash on chan_pjsip transport disconnect

ASTERISK-27688

Change-Id: Ia9b5469fea8f2b3f2d8476fae6b748a4d23e7261
---
M res/res_pjsip/pjsip_transport_events.c
1 file changed, 13 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/55/8455/1

diff --git a/res/res_pjsip/pjsip_transport_events.c b/res/res_pjsip/pjsip_transport_events.c
index c701b84..ecf0925 100644
--- a/res/res_pjsip/pjsip_transport_events.c
+++ b/res/res_pjsip/pjsip_transport_events.c
@@ -216,7 +216,12 @@
 		if (notifier->cb == cb_data->cb && (!cb_data->data
 			|| cb_data->matches(cb_data->data, notifier->data))) {
 			ao2_cleanup(notifier->data);
+                        
 			AST_VECTOR_REMOVE_UNORDERED(&monitored->monitors, idx);
+                        
+                        /* Decrement pjsip transport ref */
+                        pjsip_transport_dec_ref(monitored->transport);
+                        
 			ast_debug(3, "Unregistered monitor %p(%p) from transport %s\n",
 				notifier->cb, notifier->data, monitored->transport->obj_name);
 		}
@@ -271,7 +276,7 @@
 			.matches = matches ?: ptr_matcher,
 		};
 
-		transport_monitor_unregister_cb(monitored, &cb_data, 0);
+		transport_monitor_unregister_cb(monitored, &cb_data, 0);		
 		ao2_ref(monitored, -1);
 	}
 	ao2_unlock(transports);
@@ -300,6 +305,9 @@
 		/* Add new monitor to vector */
 		new_monitor.cb = cb;
 		new_monitor.data = ao2_bump(ao2_data);
+		
+		
+		
 		if (AST_VECTOR_APPEND(&monitored->monitors, new_monitor)) {
 			ao2_cleanup(ao2_data);
 			res = AST_TRANSPORT_MONITOR_REG_FAILED;
@@ -307,6 +315,10 @@
 				cb, ao2_data, transport->obj_name);
 		} else {
 			res = AST_TRANSPORT_MONITOR_REG_SUCCESS;
+			
+			/* Add pjsip transport ref */
+			pjsip_transport_add_ref(monitored->transport);
+			
 			ast_debug(3, "Registered monitor %p(%p) to transport %s\n",
 				cb, ao2_data, transport->obj_name);
 		}

-- 
To view, visit https://gerrit.asterisk.org/8455
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b5469fea8f2b3f2d8476fae6b748a4d23e7261
Gerrit-Change-Number: 8455
Gerrit-PatchSet: 1
Gerrit-Owner: Ross Beer <ross.beer at voicehost.co.uk>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180307/ddfd795a/attachment-0001.html>