upnp: do not delete the UpnpInstanceWrapper instance under s_lock

robUx4 · tguillem · commit 17ca1cbf2511 · 2016-06-05T14:35:06.000+02:00
It calls UpnpFinish() which might wait for some callbacks to finish and they
may be locked with s_lock.

Signed-off-by: Thomas Guillem &lt;thomas@gllm.fr&gt;
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
@@ -1298,17 +1298,20 @@ UpnpInstanceWrapper *UpnpInstanceWrapper::get(vlc_object_t *p_obj, services_disc
 
 void UpnpInstanceWrapper::release(bool isSd)
 {
-    vlc_mutex_locker lock( &s_lock );
+    UpnpInstanceWrapper *p_delete = NULL;
+    vlc_mutex_lock( &s_lock );
     if ( isSd )
     {
         delete UpnpInstanceWrapper::p_server_list;
         UpnpInstanceWrapper::p_server_list = NULL;
     }
     if (--s_instance->m_refcount == 0)
     {
-        delete s_instance;
+        p_delete = s_instance;
         s_instance = NULL;
     }
+    vlc_mutex_unlock( &s_lock );
+    delete p_delete;
 }
 
 UpnpClient_Handle UpnpInstanceWrapper::handle() const

Original file line number	Diff line number	Diff line change
`@@ -1298,17 +1298,20 @@ UpnpInstanceWrapper UpnpInstanceWrapper::get(vlc_object_t p_obj, services_disc`
`1298`	`1298`
`1299`	`1299`	`void UpnpInstanceWrapper::release(bool isSd)`
`1300`	`1300`	`{`
`1301`		`- vlc_mutex_locker lock( &s_lock );`
	`1301`	`+ UpnpInstanceWrapper *p_delete = NULL;`
	`1302`	`+ vlc_mutex_lock( &s_lock );`
`1302`	`1303`	`if ( isSd )`
`1303`	`1304`	`{`
`1304`	`1305`	`delete UpnpInstanceWrapper::p_server_list;`
`1305`	`1306`	`UpnpInstanceWrapper::p_server_list = NULL;`
`1306`	`1307`	`}`
`1307`	`1308`	`if (--s_instance->m_refcount == 0)`
`1308`	`1309`	`{`
`1309`		`- delete s_instance;`
	`1310`	`+ p_delete = s_instance;`
`1310`	`1311`	`s_instance = NULL;`
`1311`	`1312`	`}`
	`1313`	`+ vlc_mutex_unlock( &s_lock );`
	`1314`	`+ delete p_delete;`
`1312`	`1315`	`}`
`1313`	`1316`
`1314`	`1317`	`UpnpClient_Handle UpnpInstanceWrapper::handle() const`