Update licensing info

[lttng-modules.git] / ltt-context.c

diff --git a/ltt-context.c b/ltt-context.c
index cc9633ac08d63bdd46be0de4d62bf8a89e0fd76b..8f00bb1bd0067437170efa7aaecd23df8768212e 100644 (file)
--- a/ltt-context.c
+++ b/ltt-context.c
@@ -4,6 +4,8 @@
  * Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng trace/channel/event context management.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>
@@ -28,12 +30,12 @@ struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
        if (ctx->nr_fields + 1 > ctx->allocated_fields) {
                struct lttng_ctx_field *new_fields;
 
-               ctx->allocated_fields = min_t(size_t, 1, 2 * ctx->allocated_fields);
+               ctx->allocated_fields = max_t(size_t, 1, 2 * ctx->allocated_fields);
                new_fields = kzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
                if (!new_fields)
                        return NULL;
                if (ctx->fields)
-                       memcpy(new_fields, ctx->fields, ctx->nr_fields);
+                       memcpy(new_fields, ctx->fields, sizeof(*ctx->fields) * ctx->nr_fields);
                kfree(ctx->fields);
                ctx->fields = new_fields;
        }
@@ -47,8 +49,12 @@ void lttng_destroy_context(struct lttng_ctx *ctx)
 {
        int i;
 
-       for (i = 0; i < ctx->nr_fields; i++)
-               ctx->fields[i].destroy(&ctx->fields[i]);
+       if (!ctx)
+               return;
+       for (i = 0; i < ctx->nr_fields; i++) {
+               if (ctx->fields[i].destroy)
+                       ctx->fields[i].destroy(&ctx->fields[i]);
+       }
        kfree(ctx->fields);
        kfree(ctx);
 }