mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesink: don't free the context multiple times

Browse source 
Apparently the close function of the ring-buffer can be called multiple times.
This commit is contained in:
Stefan Kost 2010-09-07 00:27:07 +03:00
parent 988f228da7
commit a313bc7524
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ext/pulse/pulsesink.c
View file

@ -283,31 +283,38 @@ gst_pulsering_get_context (GstPulseRingBuffer * pbuf)
static void static void
gst_pulsering_destroy_context (GstPulseRingBuffer * pbuf) gst_pulsering_destroy_context (GstPulseRingBuffer * pbuf)
{ {
GstPulseContext *pctx;
GstPulseSink *psink; GstPulseSink *psink;
g_mutex_lock (pa_ring_buffer_mutex); g_mutex_lock (pa_ring_buffer_mutex);
psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf)); psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
pctx = g_hash_table_lookup (gst_pulse_shared_contexts, pbuf->context_name); if (pbuf->context_name) {
GstPulseContext *pctx;
gst_pulsering_destroy_stream (pbuf); GST_DEBUG_OBJECT (psink, "destroying context for pbuf=%p '%s'",
pbuf, pbuf->context_name);
if (pctx) { pctx = g_hash_table_lookup (gst_pulse_shared_contexts, pbuf->context_name);
pctx->ring_buffers = g_slist_remove (pctx->ring_buffers, pbuf);
if (!g_slist_length (pctx->ring_buffers)) {
pa_context_disconnect (pctx->context);
/* Make sure we don't get any further callbacks */ gst_pulsering_destroy_stream (pbuf);
pa_context_set_state_callback (pctx->context, NULL, NULL);
if (pctx) {
pctx->ring_buffers = g_slist_remove (pctx->ring_buffers, pbuf);
if (!g_slist_length (pctx->ring_buffers)) {
pa_context_disconnect (pctx->context);
/* Make sure we don't get any further callbacks */
pa_context_set_state_callback (pctx->context, NULL, NULL);
#ifdef HAVE_PULSE_0_9_12 #ifdef HAVE_PULSE_0_9_12
pa_context_set_subscribe_callback (pctx->context, NULL, NULL); pa_context_set_subscribe_callback (pctx->context, NULL, NULL);
#endif #endif
pa_context_unref (pctx->context); pa_context_unref (pctx->context);
g_hash_table_remove (gst_pulse_shared_contexts, pbuf->context_name); g_hash_table_remove (gst_pulse_shared_contexts, pbuf->context_name);
g_free (pbuf->context_name); g_free (pbuf->context_name);
g_slice_free (GstPulseContext, pctx); pbuf->context_name = NULL;
g_slice_free (GstPulseContext, pctx);
}
} }
} }
g_mutex_unlock (pa_ring_buffer_mutex); g_mutex_unlock (pa_ring_buffer_mutex);