diff options
| author | Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> | 2024-10-15 08:42:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 08:42:37 +0200 |
| commit | 5801ed57347add5b296babd2dfeab7251fccb373 (patch) | |
| tree | d72059a10ca4203567486929c7b01d6e26bbc070 | |
| parent | a36862365709e1bad71b1612d01ea5e3b47cc5bc (diff) | |
| parent | 395c6641b2fc5751776b26baabec21ea8e83f375 (diff) | |
| download | rspamd-5801ed57347add5b296babd2dfeab7251fccb373.tar.gz rspamd-5801ed57347add5b296babd2dfeab7251fccb373.zip | |
Merge branch 'master' into actualize-elastic-module
| -rw-r--r-- | src/ragel/smtp_base.rl | 1 | ||||
| -rw-r--r-- | src/rspamd.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ragel/smtp_base.rl b/src/ragel/smtp_base.rl index eefc430d5..952c3a5c3 100644 --- a/src/ragel/smtp_base.rl +++ b/src/ragel/smtp_base.rl @@ -1,5 +1,6 @@ %%{ machine smtp_base; + alphtype unsigned char; # Base SMTP definitions # Dependencies: none diff --git a/src/rspamd.c b/src/rspamd.c index b6c361cb2..6c204e266 100644 --- a/src/rspamd.c +++ b/src/rspamd.c @@ -1326,7 +1326,7 @@ version(struct rspamd_main *rspamd_main) #ifndef __has_feature #define __has_feature(x) 0 #endif -#if (defined(__has_feature) && __has_feature(address_sanitizer)) || defined(ADDRESS_SANITIZER) +#if (defined(__has_feature) && __has_feature(address_sanitizer)) || defined(ADDRESS_SANITIZER) || defined(__SANITIZE_ADDRESS__) rspamd_printf("ASAN enabled: TRUE\n"); #else rspamd_printf("ASAN enabled: FALSE\n"); |