From f37fc1d2992963b5948c74890c79e006b96c87a2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 26 Feb 2013 14:40:38 +0100 Subject: [PATCH] memory: don't unref allocator too soon Unref the allocator *after* we have freed the memory. We also need to keep a ref to the allocator around because following the now freed memory would lead to crashes. --- gst/gstmemory.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gst/gstmemory.c b/gst/gstmemory.c index afc652f..0907f31 100644 --- a/gst/gstmemory.c +++ b/gst/gstmemory.c @@ -83,6 +83,8 @@ _gst_memory_copy (GstMemory * mem) static void _gst_memory_free (GstMemory * mem) { + GstAllocator *allocator; + GST_CAT_DEBUG (GST_CAT_MEMORY, "free memory %p", mem); if (mem->parent) { @@ -90,8 +92,10 @@ _gst_memory_free (GstMemory * mem) gst_memory_unref (mem->parent); } - g_object_unref (mem->allocator); - gst_allocator_free (mem->allocator, mem); + allocator = mem->allocator; + + gst_allocator_free (allocator, mem); + gst_object_unref (allocator); } /** @@ -118,7 +122,7 @@ gst_memory_init (GstMemory * mem, GstMemoryFlags flags, (GstMiniObjectCopyFunction) _gst_memory_copy, NULL, (GstMiniObjectFreeFunction) _gst_memory_free); - mem->allocator = g_object_ref (allocator); + mem->allocator = gst_object_ref (allocator); if (parent) { gst_memory_lock (parent, GST_LOCK_FLAG_EXCLUSIVE); gst_memory_ref (parent); -- 2.7.4