diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-12 21:37:19 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-12 21:37:19 +0100 |
| commit | af366b20a32902e5e3aa222d3f087ff085901a49 (patch) | |
| tree | c2569b3b582f64dae66f2f10f693ef2276b49a4d /src/libutil/str_util.h | |
| parent | 80cb19900c3ab36faf92060ea639bccdcda5eaa9 (diff) | |
| download | rspamd-af366b20a32902e5e3aa222d3f087ff085901a49.tar.gz rspamd-af366b20a32902e5e3aa222d3f087ff085901a49.zip | |
[Minor] Fix more alignment and ubsan issues
Diffstat (limited to 'src/libutil/str_util.h')
| -rw-r--r-- | src/libutil/str_util.h | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/libutil/str_util.h b/src/libutil/str_util.h index c820bd10c..a1f980526 100644 --- a/src/libutil/str_util.h +++ b/src/libutil/str_util.h @@ -20,6 +20,8 @@ #include "ucl.h" #include "fstring.h" +#include <stdalign.h> + #ifdef __cplusplus extern "C" { #endif @@ -422,23 +424,35 @@ gsize rspamd_memspn (const gchar *s, const gchar *e, gsize len); /* https://graphics.stanford.edu/~seander/bithacks.html#HasMoreInWord */ #define rspamd_str_hasmore(x, n) ((((x)+~0UL/255*(127-(n)))|(x))&~0UL/255*128) +/* + * Check if a pointer is aligned; n must be power of two + */ +#define rspamd_is_aligned(p, n) (((uintptr_t)(p) & ((uintptr_t)(n) - 1)) == 0) +#define rspamd_is_aligned_as(p, v) rspamd_is_aligned(p, _Alignof(__typeof((v)))) static inline gboolean -rspamd_str_has_8bit (const guchar *beg, gsize len) { +rspamd_str_has_8bit (const guchar *beg, gsize len) +{ unsigned long *w; - gsize i, leftover = len % sizeof (*w); + gsize i, leftover; - w = (unsigned long *) beg; + if (rspamd_is_aligned_as (beg, *w)) { + leftover = len % sizeof (*w); + w = (unsigned long *) beg; - for (i = 0; i < len / sizeof (*w); i++) { - if (rspamd_str_hasmore (*w, 127)) { - return TRUE; + for (i = 0; i < len / sizeof (*w); i++) { + if (rspamd_str_hasmore (*w, 127)) { + return TRUE; + } + + w++; } - w++; + beg = (const guchar *) w; + } + else { + leftover = len; } - - beg = (const guchar *) w; for (i = 0; i < leftover; i++) { if (beg[i] > 127) { |