Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

[babeltrace.git] / src / lib / plugin / plugin.c

diff --git a/src/lib/plugin/plugin.c b/src/lib/plugin/plugin.c
index fbf02c510b361befa1b3df2092d09414280a1c98..aec5ed6837cb94378b173ad7c5a02245189b55d6 100644 (file)
--- a/src/lib/plugin/plugin.c
+++ b/src/lib/plugin/plugin.c
@@ -470,6 +470,7 @@ enum bt_plugin_find_status bt_plugin_find(const char *plugin_name,
                find_in_sys_dir, find_in_static, fail_on_load_error,
                &plugin_set);
        if (status != BT_FUNC_STATUS_OK) {
+               BT_ASSERT(!plugin_set);
                goto end;
        }
 
@@ -480,7 +481,7 @@ enum bt_plugin_find_status bt_plugin_find(const char *plugin_name,
 
                if (strcmp(plugin->info.name->str, plugin_name) == 0) {
                        *plugin_out = plugin;
-                       bt_object_get_no_null_check(*plugin_out);
+                       bt_object_get_ref_no_null_check(*plugin_out);
                        goto end;
                }
        }
@@ -497,6 +498,8 @@ end:
                        "name=\"%s\"", plugin_name);
        }
 
+       bt_plugin_set_put_ref(plugin_set);
+
        return status;
 }
 
@@ -842,7 +845,7 @@ struct bt_component_class *borrow_component_class_by_name(
                const char *comp_class_cand_name =
                        bt_component_class_get_name(comp_class_candidate);
 
-               BT_ASSERT(comp_class_cand_name);
+               BT_ASSERT_DBG(comp_class_cand_name);
 
                if (strcmp(name, comp_class_cand_name) == 0) {
                        comp_class = comp_class_candidate;