Skip to content

Commit 87a87b1

Browse files
nokute78edsiper
authored andcommitted
out_stackdriver: free metadata_server when 'METADATA_SERVER' is not set
Signed-off-by: Takahiro Yamashita <[email protected]>
1 parent 6da5c2b commit 87a87b1

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

plugins/out_stackdriver/stackdriver_conf.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,20 @@ int flb_stackdriver_conf_destroy(struct flb_stackdriver *ctx)
563563
}
564564
if (ctx->env->metadata_server) {
565565
flb_sds_destroy(ctx->env->metadata_server);
566+
/*
567+
* If ctx->env is not NULL,
568+
* ctx->metadata_server points ctx->env->metadata_server.
569+
*
570+
* We set ctx->metadata_server to NULL to prevent double free.
571+
*/
572+
ctx->metadata_server = NULL;
566573
}
567574
flb_free(ctx->env);
568575
}
576+
577+
if (ctx->metadata_server) {
578+
flb_sds_destroy(ctx->metadata_server);
579+
}
569580

570581
if (ctx->is_k8s_resource_type){
571582
flb_sds_destroy(ctx->namespace_name);

0 commit comments

Comments
 (0)