mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

mdns: Fix a crash on context error

Browse source 
Make sure not to free the microdns provider context until the
device provider asks it to stop. Fixes a crash if there is
an error (such as MDNS port being busy) that makes the
mdns listener exit early.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5198>
This commit is contained in:
Jan Schmidt 2023-08-18 18:21:18 +10:00 committed by GStreamer Marge Bot
parent 17ebfc7cb7
commit 1b0b1fc0fd
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/ext/mdns/gstmicrodnsdevice.c
View file

@ -44,6 +44,7 @@ struct _GstMDNSDeviceProvider
struct _ListenerContext struct _ListenerContext
{ {
GMutex lock; GMutex lock;
GCond stop_cond;
GstDeviceProvider *provider; GstDeviceProvider *provider;
/* The following fields are protected by @lock */ /* The following fields are protected by @lock */
@ -362,9 +363,18 @@ _listen (ListenerContext * ctx)
done: done:
GST_INFO_OBJECT (ctx->provider, "Done listening"); GST_INFO_OBJECT (ctx->provider, "Done listening");
/* Wait until we're told to stop, or gst_mdns_device_provider_stop()
can access a freed context */
g_mutex_lock (&ctx->lock);
while (!ctx->stop) {
g_cond_wait (&ctx->stop_cond, &ctx->lock);
}
g_mutex_unlock (&ctx->lock);
g_sequence_free (ctx->last_seen_devices); g_sequence_free (ctx->last_seen_devices);
g_hash_table_unref (ctx->devices); g_hash_table_unref (ctx->devices);
g_mutex_clear (&ctx->lock); g_mutex_clear (&ctx->lock);
g_cond_clear (&ctx->stop_cond);
g_free (ctx); g_free (ctx);
return NULL; return NULL;
@ -385,6 +395,7 @@ gst_mdns_device_provider_start (GstDeviceProvider * provider)
ListenerContext *ctx = g_new0 (ListenerContext, 1); ListenerContext *ctx = g_new0 (ListenerContext, 1);
g_mutex_init (&ctx->lock); g_mutex_init (&ctx->lock);
g_cond_init (&ctx->stop_cond);
ctx->provider = provider; ctx->provider = provider;
ctx->devices = ctx->devices =
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
@ -405,6 +416,7 @@ gst_mdns_device_provider_stop (GstDeviceProvider * provider)
g_mutex_lock (&self->current_ctx->lock); g_mutex_lock (&self->current_ctx->lock);
self->current_ctx->stop = true; self->current_ctx->stop = true;
g_cond_broadcast (&self->current_ctx->stop_cond);
g_mutex_unlock (&self->current_ctx->lock); g_mutex_unlock (&self->current_ctx->lock);
self->current_ctx = NULL; self->current_ctx = NULL;