Commit 1062992b authored by Vincent Penquerc'h's avatar Vincent Penquerc'h
Browse files

oss4: fix a missing unlock and a return-only-when-assertions-enabled

Spotted on the side while looking at another issue.
parent 7ff514fe
...@@ -315,7 +315,8 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname) ...@@ -315,7 +315,8 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname)
fd = GST_OSS4_SOURCE (probe)->fd; fd = GST_OSS4_SOURCE (probe)->fd;
} else { } else {
GST_OBJECT_UNLOCK (obj); 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 */ /* 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) ...@@ -342,6 +343,7 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname)
} }
if (devices == NULL) { if (devices == NULL) {
GST_OBJECT_UNLOCK (obj);
GST_DEBUG_OBJECT (obj, "No devices found"); GST_DEBUG_OBJECT (obj, "No devices found");
goto done; goto done;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment