pack: do not multiply out_size by realloc_size #9193
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
braydonk
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
In `flb_msgpack_raw_to_json_sds`, when the buffer is reallocated it calls `flb_sds_increase`. This increases the length by adding the `len` argument to the length and reallocating the sds object. After doing this, the `out_size` is multiplied by `realloc_size`. This does not match reality, as what happened in the reallocation was additive not multiplicative. This commit corrects the inconsistency. Signed-off-by: braydonk <[email protected]>
braydonk
force-pushed
the
fix_json_realloc
branch
from
8556ffe to
4975325
Compare
edsiper
reviewed
Aug 12, 2024
src/flb_pack.c
Outdated
| @@ -810,7 +810,7 @@ flb_sds_t flb_msgpack_raw_to_json_sds(const void *in_buf, size_t in_size) | |||
| tmp_buf = flb_sds_increase(out_buf, realloc_size); | |||
| if (tmp_buf) { | |||
| out_buf = tmp_buf; | |||
| out_size *= realloc_size; | |||
| out_size += realloc_size; | |||
There was a problem hiding this comment.
good catch. what about to setting out_size with flb_sds_alloc() ?
https://github.com/fluent/fluent-bit/blob/master/include/fluent-bit/flb_sds.h#L67-L70
There was a problem hiding this comment.
Done in 087ccda. Tested and it seems to work as expected.
Signed-off-by: braydonk <[email protected]>
braydonk
force-pushed
the
fix_json_realloc
branch
from
087ccda to
c937e9c
Compare
|
thank you |
ridwanmsharif
added a commit
to GoogleCloudPlatform/ops-agent
that referenced
this pull request
Aug 14, 2024
This change picks up this chage from Fluent Bit: fluent/fluent-bit#9193
edsiper
pushed a commit
that referenced
this pull request
Aug 14, 2024
In `flb_msgpack_raw_to_json_sds`, when the buffer is reallocated it calls `flb_sds_increase`. This increases the length by adding the `len` argument to the length and reallocating the sds object. After doing this, the `out_size` is multiplied by `realloc_size`. This does not match reality, as what happened in the reallocation was additive not multiplicative. This commit corrects the inconsistency. Signed-off-by: braydonk <[email protected]>
9 tasks
ridwanmsharif
pushed a commit
to ridwanmsharif/fluent-bit
that referenced
this pull request
Aug 14, 2024
In `flb_msgpack_raw_to_json_sds`, when the buffer is reallocated it calls `flb_sds_increase`. This increases the length by adding the `len` argument to the length and reallocating the sds object. After doing this, the `out_size` is multiplied by `realloc_size`. This does not match reality, as what happened in the reallocation was additive not multiplicative. This commit corrects the inconsistency. Signed-off-by: braydonk <[email protected]>
ridwanmsharif
added a commit
to GoogleCloudPlatform/ops-agent
that referenced
this pull request
Aug 14, 2024
This change picks up this chage from Fluent Bit: fluent/fluent-bit#9193 You can check out the branch here: https://github.com/ridwanmsharif/fluent-bit/tree/ridwanmsharif/cherrypick-fluentbit-pack-bugfix
braydonk
added a commit
that referenced
this pull request
Aug 14, 2024
In `flb_msgpack_raw_to_json_sds`, when the buffer is reallocated it calls `flb_sds_increase`. This increases the length by adding the `len` argument to the length and reallocating the sds object. After doing this, the `out_size` is multiplied by `realloc_size`. This does not match reality, as what happened in the reallocation was additive not multiplicative. This commit corrects the inconsistency. Signed-off-by: braydonk <[email protected]>
ridwanmsharif
added a commit
to GoogleCloudPlatform/ops-agent
that referenced
this pull request
Aug 14, 2024
This change picks up this chage from Fluent Bit: fluent/fluent-bit#9193 You can check out the branch here: https://github.com/ridwanmsharif/fluent-bit/tree/ridwanmsharif/cherrypick-fluentbit-pack-bugfix
ridwanmsharif
added a commit
to GoogleCloudPlatform/ops-agent
that referenced
this pull request
Aug 15, 2024
This change picks up this chage from Fluent Bit: fluent/fluent-bit#9193 Related bug: b/359600424
ridwanmsharif
added a commit
to GoogleCloudPlatform/ops-agent
that referenced
this pull request
Aug 15, 2024
This change picks up this chage from Fluent Bit: fluent/fluent-bit#9193 Related bug: b/359600424
AndrewChubatiuk
pushed a commit
to AndrewChubatiuk/fluent-bit
that referenced
this pull request
Sep 24, 2024
In `flb_msgpack_raw_to_json_sds`, when the buffer is reallocated it calls `flb_sds_increase`. This increases the length by adding the `len` argument to the length and reallocating the sds object. After doing this, the `out_size` is multiplied by `realloc_size`. This does not match reality, as what happened in the reallocation was additive not multiplicative. This commit corrects the inconsistency. Signed-off-by: braydonk <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
flb_msgpack_raw_to_json_sds, when the buffer is reallocated it callsflb_sds_increase. This increases the length by adding thelenargument to the length and reallocating the sds object. After doing this, theout_sizeis multiplied byrealloc_size. This does not match reality, as what happened in the reallocation was additive not multiplicative. This commit corrects the inconsistency.Fixes #9192.
Fixes #8993.
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.