Skip to content

next/970/20250827/v1#13755

Merged
victorjulien merged 4 commits into
OISF:masterfrom
victorjulien:next/970/20250827/v1
Aug 27, 2025
Merged

next/970/20250827/v1#13755
victorjulien merged 4 commits into
OISF:masterfrom
victorjulien:next/970/20250827/v1

Conversation

Boris Tonofa and others added 4 commits August 27, 2025 08:42
de_ctx->rule_file is never NULL inside DetectFileHashParse(); add a comment
stating this fact and remove the superfluous NULL guard.

No functional change – the patch only clarifies the code and trims a few
lines of dead code.

Bug 7769
In util-hash.c there was some behavior that is unexpected and likely
incorrect. To see this behavior, create a hash table 32 entries wide
and use the default hash function. Then add a short string “abc”,
observe the string is stored properly. Now remove a string “iln”, and
observe string “abc” is no longer in the table.

This is because the hash function is not properly handling collisions in
some edge cases.

Includes new unit test:

- UT verifies that the hash function generates a collision for
  the selected test data. This must be true for the bug to be present.
  Then UT demonstrates the bug by adding two items to the hash table
  that collide, and then removing one of them 2x. The bug is that the
  other value is removed as well.

Bug OISF#7828 --> https://redmine.openinfosecfoundation.org/issues/7828

Signed-off-by: Charlie Vigue <charlie.vigue@openvpn.com>
Since userguide/conf.py uses the deprecated get_html_theme_path(),
sphinx emits a warning which breaks the build as warnings are treated
as errors.

Issue: 7859
@codecov

codecov Bot commented Aug 27, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.72%. Comparing base (49629f7) to head (2a17ab6).
⚠️ Report is 4 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff             @@
##           master   #13755       +/-   ##
===========================================
+ Coverage   77.16%   83.72%    +6.55%     
===========================================
  Files         945     1011       +66     
  Lines      172228   275068   +102840     
===========================================
+ Hits       132906   230309    +97403     
- Misses      39322    44759     +5437     
Flag Coverage Δ
fuzzcorpus 62.94% <77.27%> (+0.01%) ⬆️
livemode 19.01% <36.36%> (+0.01%) ⬆️
pcap 44.73% <59.09%> (+0.05%) ⬆️
suricata-verify 65.07% <68.18%> (-0.01%) ⬇️
unittests 59.17% <76.92%> (?)

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jufajardini jufajardini left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

  • Checks pass (except codeql, for API limits)
  • Commits and line changes consistent with original, approved PRs

@suricata-qa

Copy link
Copy Markdown

Information: QA ran without warnings.

Pipeline = 27250

@victorjulien victorjulien merged commit 2a17ab6 into OISF:master Aug 27, 2025
61 of 62 checks passed
@victorjulien victorjulien deleted the next/970/20250827/v1 branch August 27, 2025 20:52
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.

6 participants