Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

out_forward: fix memory leak during connection loss #8399

Merged
merged 1 commit into from
Jan 22, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions plugins/out_forward/forward.c
Original file line number Diff line number Diff line change
Expand Up @@ -1574,9 +1574,7 @@ static void cb_forward_flush(struct flb_event_chunk *event_chunk,
if (!u_conn) {
flb_plg_error(ctx->ins, "no upstream connections available");
msgpack_sbuffer_destroy(&mp_sbuf);
if (fc->time_as_integer == FLB_TRUE) {
flb_free(out_buf);
}
flb_free(out_buf);
flb_free(flush_ctx);
FLB_OUTPUT_RETURN(FLB_RETRY);
}
Expand All @@ -1590,9 +1588,7 @@ static void cb_forward_flush(struct flb_event_chunk *event_chunk,
flb_plg_error(ctx->ins, "no unix socket connection available");

msgpack_sbuffer_destroy(&mp_sbuf);
if (fc->time_as_integer == FLB_TRUE) {
flb_free(out_buf);
}
flb_free(out_buf);
flb_free(flush_ctx);
FLB_OUTPUT_RETURN(FLB_RETRY);
}
Expand Down Expand Up @@ -1622,9 +1618,7 @@ static void cb_forward_flush(struct flb_event_chunk *event_chunk,
}

msgpack_sbuffer_destroy(&mp_sbuf);
if (fc->time_as_integer == FLB_TRUE) {
flb_free(out_buf);
}
flb_free(out_buf);
flb_free(flush_ctx);
FLB_OUTPUT_RETURN(FLB_RETRY);
}
Expand Down
Loading