Dataset string memcap 3910/v3 #11058
Closed
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
In order to have access to the length of datatypes with variable lengths to correctly update memuse to calculate memcaps. Bug 3910
So far, when the data size was passed to the THash API, it was sent as a sizeof(Struct) which works fine for the other data types as they have a fixed length but not for the StringType. However, because of the sizeof construct, the length of a string type dataset was always taken to be 16 Bytes which is only the size of the struct itself. It did not accomodate the actual size of the string that the StringType holds. Fix this so that the memuse that is used to determine whether memcap was reached also takes into consideration the size of the actual string. Bug 3910
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #11058 +/- ##
==========================================
+ Coverage 80.63% 83.63% +3.00%
==========================================
Files 922 922
Lines 250137 250332 +195
==========================================
+ Hits 201699 209374 +7675
+ Misses 48438 40958 -7480
Flags with carried forward coverage won't be shown. Click here to find out more. |
victorjulien
requested changes
May 13, 2024
| @@ -517,6 +524,10 @@ static THashData *THashDataGetNew(THashTableContext *ctx, void *data) | |||
| // setup the data | |||
| BUG_ON(ctx->config.DataSet(h->data, data) != 0); | |||
|
|
|||
| if (ctx->config.DataLength) { | |||
There was a problem hiding this comment.
can this move into THashDataAlloc?
There was a problem hiding this comment.
No. I tried that but found that alloc happens before the data is set (values filled in the respective data types) and it leads to incorrect results. We only have a length after the DataSet callback is done.
|
Information: QA ran without warnings. Pipeline 20585 |
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.
Link to redmine ticket: https://redmine.openinfosecfoundation.org/issues/3910
Previous PR: #11056
Changes since v2: