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.

Sign up for GitHub

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

Jump to bottom

filter_parser: fix memory leak (#8614) #8712

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

filter_parser: fix memory leak (#8614) #8712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions plugins/filter_parser/filter_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ static int cb_parser_filter(const void *data, size_t bytes,
struct flb_config *config)
{
int continue_parsing;
int continue_reserve_only;
struct filter_parser_ctx *ctx = context;
struct flb_time tm;
msgpack_object *obj;
Expand Down Expand Up @@ -253,11 +254,21 @@ static int cb_parser_filter(const void *data, size_t bytes,
}

continue_parsing = FLB_TRUE;
continue_reserve_only = FLB_FALSE;
for (i = 0; i < map_num && continue_parsing; i++) {
kv = &obj->via.map.ptr[i];
if (ctx->reserve_data) {
append_arr[append_arr_i] = kv;
append_arr_i++;
/*
* If we already parsed a field matching the key name
* then skip parsing the rest to avoid any entries with
* the same key name (which would cause reassignment of
* out_buf resulting in a memory leak).
*/
if (continue_reserve_only) {
continue;
}
}
if ( msgpackobj2char(&kv->key, &key_str, &key_len) < 0 ) {
/* key is not string */
Expand Down Expand Up @@ -299,6 +310,7 @@ static int cb_parser_filter(const void *data, size_t bytes,
append_arr_len--;
append_arr[append_arr_i] = NULL;
}
continue_reserve_only = FLB_TRUE;
}
else {
continue_parsing = FLB_FALSE;
Expand Down