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;
}
{
int i;
+ if (!ctx)
+ return;
for (i = 0; i < ctx->nr_fields; i++) {
if (ctx->fields[i].destroy)
ctx->fields[i].destroy(&ctx->fields[i]);