Skip to content

Commit

Permalink
disable more santizers in opmphmHashfunction
Browse files Browse the repository at this point in the history
  • Loading branch information
kodebach committed Oct 2, 2020
1 parent 63c29ca commit 85d7224
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,18 @@ if (ENABLE_ASAN)
set (ELEKTRA_NO_SANITIZE_INTEGER "__attribute__ ((no_sanitize (\"integer\")))")
set (ELEKTRA_NO_SANITIZE_UNSIGNED_INTEGER_OVERFLOW "__attribute__ ((no_sanitize (\"unsigned-integer-overflow\")))")
set (ELEKTRA_NO_SANITIZE_UNDEFINED "__attribute__ ((no_sanitize (\"undefined\")))")
set (ELEKTRA_NO_SANITIZE_ADDRESS "__attribute__ ((no_sanitize (\"address\")))")
elseif (CMAKE_C_COMPILER_ID MATCHES "GNU") # others section
set (ELEKTRA_NO_SANITIZE_INTEGER "")
set (ELEKTRA_NO_SANITIZE_UNSIGNED_INTEGER_OVERFLOW "")
set (ELEKTRA_NO_SANITIZE_UNDEFINED "__attribute__ ((no_sanitize_undefined))")
set (ELEKTRA_NO_SANITIZE_ADDRESS "")
endif (CMAKE_C_COMPILER_ID MATCHES "Clang")
else (ENABLE_ASAN)
set (ELEKTRA_NO_SANITIZE_INTEGER "")
set (ELEKTRA_NO_SANITIZE_UNSIGNED_INTEGER_OVERFLOW "")
set (ELEKTRA_NO_SANITIZE_UNDEFINED "")
set (ELEKTRA_NO_SANITIZE_ADDRESS "")
endif (ENABLE_ASAN)

if (ENABLE_OPTIMIZATIONS)
Expand Down
1 change: 1 addition & 0 deletions src/include/kdbconfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
#define ELEKTRA_NO_SANITIZE_INTEGER @ELEKTRA_NO_SANITIZE_INTEGER@
#define ELEKTRA_NO_SANITIZE_UNSIGNED_INTEGER_OVERFLOW @ELEKTRA_NO_SANITIZE_UNSIGNED_INTEGER_OVERFLOW@
#define ELEKTRA_NO_SANITIZE_UNDEFINED @ELEKTRA_NO_SANITIZE_UNDEFINED@
#define ELEKTRA_NO_SANITIZE_ADDRESS @ELEKTRA_NO_SANITIZE_ADDRESS@

/** Where plugins are installed */
#define BUILTIN_PLUGIN_FOLDER "@BUILTIN_PLUGIN_FOLDER@"
Expand Down
2 changes: 2 additions & 0 deletions src/libs/elektra/opmphm.c
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ void opmphmClear (Opmphm * opmphm)
// sanitize a hash function is silly, so ignore it!
ELEKTRA_NO_SANITIZE_UNDEFINED
ELEKTRA_NO_SANITIZE_INTEGER
ELEKTRA_NO_SANITIZE_ADDRESS
uint32_t opmphmHashfunction (const void * key, size_t length, uint32_t initval)
{
uint32_t a, b, c;
Expand Down Expand Up @@ -720,6 +721,7 @@ uint32_t opmphmHashfunction (const void * key, size_t length, uint32_t initval)
// sanitize a hash function is silly, so ignore it!
ELEKTRA_NO_SANITIZE_UNDEFINED
ELEKTRA_NO_SANITIZE_INTEGER
ELEKTRA_NO_SANITIZE_ADDRESS
uint32_t opmphmHashfunction (const void * key, size_t length, uint32_t initval)
{
uint32_t a, b, c;
Expand Down

0 comments on commit 85d7224

Please sign in to comment.