Fix: param-validation: remove memory leaks
authorSimon Marchi <simon.marchi@efficios.com>
Mon, 21 Oct 2019 21:09:02 +0000 (17:09 -0400)
committerSimon Marchi <simon.marchi@efficios.com>
Tue, 22 Oct 2019 22:00:36 +0000 (18:00 -0400)
The GArray allocated in bt_param_validation_validate is never freed, fix
that.  Furthermore, there's a spurious call to
g_ptr_array_new_with_free_func that shouldn't be there, probably the
result of a bad merge or bad edit, causing another leak.  Remove that
one.

Change-Id: I89afeaa7e6ee67b6536daa42dc2c6d74ec79ae0c
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2233
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
src/plugins/common/param-validation/param-validation.c

index ca80e888add31aa156ae4bbcec2c3730bb46d3d7..b52332bcaac106cb6a8f4f2b44947abd43f45cc5 100644 (file)
@@ -400,10 +400,10 @@ enum bt_param_validation_status bt_param_validation_validate(
        struct bt_param_validation_map_value_descr map_value_descr;
        enum bt_param_validation_status status;
 
-       ctx.error = NULL;
+       memset(&ctx, '\0', sizeof(ctx));
+
        ctx.scope_stack = g_array_new(FALSE, FALSE,
                sizeof(struct validate_ctx_stack_element));
-                       g_ptr_array_new_with_free_func(g_free);
        if (!ctx.scope_stack) {
                status = BT_PARAM_VALIDATION_STATUS_MEMORY_ERROR;
                goto end;
@@ -417,5 +417,9 @@ end:
        *error = ctx.error;
        ctx.error = NULL;
 
+       if (ctx.scope_stack) {
+               g_array_free(ctx.scope_stack, TRUE);
+       }
+
        return status;
 }
This page took 0.026203 seconds and 4 git commands to generate.