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

Dev 7.0.4/v2 #10350

Merged
merged 6 commits into from
Feb 10, 2024
Merged

Dev 7.0.4/v2 #10350

merged 6 commits into from
Feb 10, 2024

Conversation

inashivb
Copy link
Member

@inashivb inashivb commented Feb 9, 2024

inashivb and others added 6 commits February 9, 2024 09:51
As flagged critical by codescan

(cherry picked from commit 7f5e98e)
error: writing `&Vec` instead of `&[_]` involves a new object where a slice will do
   --> src/dns/log.rs:371:29
    |
371 | pub fn dns_print_addr(addr: &Vec<u8>) -> std::string::String {
    |                             ^^^^^^^^ help: change this to: `&[u8]`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#ptr_arg

(cherry picked from commit 68b0052)
Add not-needed SCCalloc return check to satisfy our Cocci malloc
checks as it can't see that the caller immediately checks the return
value of this simple wrapper around SCCalloc.

(cherry picked from commit f800ed0)
Copy link

codecov bot commented Feb 9, 2024

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (be68bbc) 82.25% compared to head (ae6d040) 82.25%.

Additional details and impacted files
@@             Coverage Diff             @@
##           main-7.0.x   #10350   +/-   ##
===========================================
  Coverage       82.25%   82.25%           
===========================================
  Files             975      975           
  Lines          274915   274920    +5     
===========================================
+ Hits           226128   226140   +12     
+ Misses          48787    48780    -7     
Flag Coverage Δ
fuzzcorpus 63.51% <53.84%> (+0.02%) ⬆️
suricata-verify 61.20% <53.84%> (+<0.01%) ⬆️
unittests 62.88% <15.38%> (+<0.01%) ⬆️

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

@inashivb inashivb marked this pull request as ready for review February 9, 2024 15:20
@inashivb inashivb requested review from victorjulien, jasonish and a team as code owners February 9, 2024 15:20
Copy link
Contributor

@lukashino lukashino 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:

ERROR: QA failed on SURI_TLPW2_autofp_suri_time.

ERROR: QA failed on SURI_TLPR1_suri_time.

field baseline test %
SURI_TLPW2_autofp_stats_chk
.uptime 120 111 92.5%
SURI_TLPR1_stats_chk
.uptime 697 644 92.4%
.http.memuse 336824 394448 117.11%

Pipeline 18273

@victorjulien victorjulien merged commit ae6d040 into OISF:main-7.0.x Feb 10, 2024
82 checks passed
@victorjulien
Copy link
Member

Merged in #10355, thanks!

@inashivb inashivb deleted the dev-7.0.4/v2 branch February 12, 2024 03:58
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