mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-06-23 00:20:34 +00:00
Code Issues Projects Releases Wiki Activity

threadshare/udpsink: Don't hold settings lock while calling into the sink pad handler to clear the clients

Browse source 
Otherwise we can deadlock because of a lock order issue:
 - render() is called with the sink pad handler lock and takes the
   settings lock
 - clearing clients takes the sink pad handler lock
This commit is contained in:
Sebastian Dröge 2020-07-30 16:26:13 +03:00
parent 98b618cc9d
commit 89346fa945
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generic/threadshare/src/udpsink.rs
View file

@ -1403,10 +1403,12 @@ impl ObjectImpl for UdpSink {
.expect("type checked upstream")
.unwrap_or_else(|| "".into());
let current_client = settings
.host
let host = settings.host.clone();
let port = settings.port;
let current_client = host
.iter()
.filter_map(|host| try_into_socket_addr(&element, host, settings.port).ok());
.filter_map(|host| try_into_socket_addr(&element, &host, port).ok());
let clients_iter = current_client.chain(clients.split(',').filter_map(|client| {
let rsplit: Vec<&str> = client.rsplitn(2, ':').collect();
@ -1429,6 +1431,7 @@ impl ObjectImpl for UdpSink {
None
}
}));
drop(settings);
self.clear_clients(clients_iter);
}