shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

Merge pull request #3911 from crrodriguez/asan-fixes

Browse Source 
Asan fixes
This commit is contained in:
Lennart Poettering 2016-08-06 17:02:17 +02:00 committed by GitHub
commit 23dab159d7
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/journal/lookup3.c
View File

@ -317,7 +317,7 @@ uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
* still catch it and complain. The masking trick does make the hash
* noticeably faster for short strings (like English words).
*/
#ifndef VALGRIND
#if !defined(VALGRIND) && !defined(__SANITIZE_ADDRESS__)
switch(length)
{
@ -503,7 +503,7 @@ void jenkins_hashlittle2(
* still catch it and complain. The masking trick does make the hash
* noticeably faster for short strings (like English words).
*/
#ifndef VALGRIND
#if !defined(VALGRIND) && !defined(__SANITIZE_ADDRESS__)
switch(length)
{
@ -681,7 +681,7 @@ uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
* still catch it and complain. The masking trick does make the hash
* noticeably faster for short strings (like English words).
*/
#ifndef VALGRIND
#if !defined(VALGRIND) && !defined(__SANITIZE_ADDRESS__)
switch(length)
{

2
src/test/test-id128.c
View File

@ -144,7 +144,7 @@ int main(int argc, char *argv[]) {
assert_se(ftruncate(fd, 0) >= 0);
assert_se(sd_id128_randomize(&id) >= 0);
assert_se(write(fd, id128_to_uuid_string(id, t), 36) == 36);
assert_se(write(fd, id128_to_uuid_string(id, q), 36) == 36);
assert_se(lseek(fd, 0, SEEK_SET) == 0);
assert_se(id128_read_fd(fd, ID128_PLAIN, &id2) == -EINVAL);

3
src/test/test-sigbus.c
View File

@ -29,6 +29,9 @@ int main(int argc, char *argv[]) {
void *addr = NULL;
uint8_t *p;
#ifdef __SANITIZE_ADDRESS__
return EXIT_TEST_SKIP;
#endif
sigbus_install();
assert_se(sigbus_pop(&addr) == 0);