From 1062992b4a6f991255c1b0f4ec81a8bea2674116 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Fri, 2 May 2014 09:33:51 +0100 Subject: [PATCH] oss4: fix a missing unlock and a return-only-when-assertions-enabled Spotted on the side while looking at another issue. --- sys/oss4/oss4-property-probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/oss4/oss4-property-probe.c b/sys/oss4/oss4-property-probe.c index 2e164f2..51ff3c1 100644 --- a/sys/oss4/oss4-property-probe.c +++ b/sys/oss4/oss4-property-probe.c @@ -315,7 +315,8 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname) fd = GST_OSS4_SOURCE (probe)->fd; } else { GST_OBJECT_UNLOCK (obj); - g_return_val_if_reached (NULL); + g_assert_not_reached (); + return NULL; } /* copy fd if it's open, so we can just unconditionally close() later */ @@ -342,6 +343,7 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname) } if (devices == NULL) { + GST_OBJECT_UNLOCK (obj); GST_DEBUG_OBJECT (obj, "No devices found"); goto done; } -- 2.7.4