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

next/518/20240704/v1 #11414

Merged
merged 5 commits into from
Jul 4, 2024
Merged

Conversation

victorjulien
Copy link
Member

catenacyber and others added 5 commits July 4, 2024 06:37
Ticket: 7053

As flow state would be overwritten by established...
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
@victorjulien victorjulien requested a review from jufajardini as a code owner July 4, 2024 06:21
Copy link

codecov bot commented Jul 4, 2024

Codecov Report

Attention: Patch coverage is 74.62687% with 17 lines in your changes missing coverage. Please review.

Project coverage is 82.44%. Comparing base (efbf627) to head (a7af371).

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11414      +/-   ##
==========================================
+ Coverage   82.43%   82.44%   +0.01%     
==========================================
  Files         938      938              
  Lines      248044   248086      +42     
==========================================
+ Hits       204465   204534      +69     
+ Misses      43579    43552      -27     
Flag Coverage Δ
fuzzcorpus 60.10% <64.06%> (-0.01%) ⬇️
livemode 18.72% <42.18%> (+<0.01%) ⬆️
pcap 43.78% <37.50%> (+0.05%) ⬆️
suricata-verify 61.41% <75.00%> (+<0.01%) ⬆️
unittests 59.43% <25.37%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Member

@inashivb inashivb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 21364

@victorjulien victorjulien merged commit a7af371 into OISF:master Jul 4, 2024
57 checks passed
@victorjulien victorjulien deleted the next/518/20240704/v1 branch July 4, 2024 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants