From 09d628f8f1a103a32b8c9d25581299f77480c4d5 Mon Sep 17 00:00:00 2001 From: David Svensson Fors Date: Mon, 23 Sep 2013 11:35:43 +0200 Subject: [PATCH] audioringbuffer: check if acquired in set_timestamp Also use GST_OBJECT_LOCK when accessing object data in set_timestamp. https://bugzilla.gnome.org/show_bug.cgi?id=702230 --- gst-libs/gst/audio/gstaudioringbuffer.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/audio/gstaudioringbuffer.c b/gst-libs/gst/audio/gstaudioringbuffer.c index 049416187f..0a883efdcb 100644 --- a/gst-libs/gst/audio/gstaudioringbuffer.c +++ b/gst-libs/gst/audio/gstaudioringbuffer.c @@ -1984,9 +1984,20 @@ gst_audio_ring_buffer_set_timestamp (GstAudioRingBuffer * buf, gint readseg, GST_INFO_OBJECT (buf, "Storing timestamp %" GST_TIME_FORMAT " @ %d", GST_TIME_ARGS (timestamp), readseg); - if (buf->timestamps) { - buf->timestamps[readseg] = timestamp; - } else { - GST_ERROR_OBJECT (buf, "Could not store timestamp, no timestamps buffer"); + + GST_OBJECT_LOCK (buf); + if (G_UNLIKELY (!buf->acquired)) + goto not_acquired; + + buf->timestamps[readseg] = timestamp; + +done: + GST_OBJECT_UNLOCK (buf); + return; + +not_acquired: + { + GST_DEBUG_OBJECT (buf, "we are not acquired"); + goto done; } }