From f4cca41f954713acccd4ea6375ae101e27b9c189 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 21 Jul 2017 12:20:43 +0200 Subject: common: exit early on error --- bin/tools/common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/tools/common.c b/bin/tools/common.c index c849727..b2ac943 100644 --- a/bin/tools/common.c +++ b/bin/tools/common.c @@ -102,6 +102,9 @@ cleanup: camera = uca_plugin_manager_get_camerav (manager, name, n_props, params, error); + if (camera == NULL) + goto get_camera_exit; + uca_camera_parse_arg_props (camera, uca_prop_assignment_array, n_props, error); for (guint i = 0; i < n_props; i++) { @@ -109,7 +112,7 @@ cleanup: g_free ((gchar *) params[i].name); } +get_camera_exit: g_free (params); - return camera; } -- cgit v1.2.3