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.

Sign up for GitHub

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

rust: don't suppress static_mut_refs globally - v3 #12680

Closed
wants to merge 4 commits into from
Closed

rust: don't suppress static_mut_refs globally - v3 #12680

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ae5744
smtp: remove SCMimeSmtpConfigExtractUrlsSchemeReset
jasonish Feb 25, 2025
f30ec13
smtp: suppress static_mut_refs where needed
jasonish Feb 25, 2025
b486d55
smb: wrap read access to static mutables in function
jasonish Feb 26, 2025
02cde06
rust: remove allow of static mutables
jasonish Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions rust/src/mime/smtp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,11 +742,6 @@ pub unsafe extern "C" fn SCMimeSmtpConfigHeaderValueDepth(val: u32) {
MIME_SMTP_CONFIG_HEADER_VALUE_DEPTH = val;
}

#[no_mangle]
pub unsafe extern "C" fn SCMimeSmtpConfigExtractUrlsSchemeReset() {
MIME_SMTP_CONFIG_EXTRACT_URL_SCHEMES.clear();
}

#[no_mangle]
pub unsafe extern "C" fn SCMimeSmtpConfigExtractUrlsSchemeAdd(
str: *const std::os::raw::c_char,
Expand Down
2 changes: 0 additions & 2 deletions src/app-layer-smtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ static void SMTPConfigure(void) {
if (extract_urls_schemes) {
ConfNode *scheme = NULL;

SCMimeSmtpConfigExtractUrlsSchemeReset();
TAILQ_FOREACH (scheme, &extract_urls_schemes->head, next) {
size_t scheme_len = strlen(scheme->val);
if (scheme_len > UINT16_MAX - SCHEME_SUFFIX_LEN) {
Expand All @@ -383,7 +382,6 @@ static void SMTPConfigure(void) {
} else {
/* Add default extract url scheme 'http' since
* extract-urls-schemes wasn't found in the config */
SCMimeSmtpConfigExtractUrlsSchemeReset();
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks I think I used this while trying to have a fuzz target that reload the configuration for each input

SCMimeSmtpConfigExtractUrlsSchemeAdd("http://");
}

Expand Down