diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-05 17:14:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-05 17:14:41 +0000 |
| commit | 20420b19577e0677b49adc48515cf492ecb76510 (patch) | |
| tree | b40cfd9e8802b2879a81663220a69c0d24691ebf /libfuzzer/FuzzerInterceptors.cpp | |
| parent | aa95cac2104deb03bff16b617beddd7822903517 (diff) | |
| parent | d2f65654664d2c613523c7cfa351c0a821402b51 (diff) | |
| download | libfuzzer-sys-android12-qpr1-d-s3-release.tar.gz | |
Upgrade rust/crates/libfuzzer-sys to 0.4.0 am: d1325ea499 am: 4bc707d895 am: d2f6565466android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libfuzzer-sys/+/1662761
Change-Id: Id51e18804bd04a1d53ae6d055181e0cbce3bf7dd
Diffstat (limited to 'libfuzzer/FuzzerInterceptors.cpp')
| -rw-r--r-- | libfuzzer/FuzzerInterceptors.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libfuzzer/FuzzerInterceptors.cpp b/libfuzzer/FuzzerInterceptors.cpp index a1a6478..b877986 100644 --- a/libfuzzer/FuzzerInterceptors.cpp +++ b/libfuzzer/FuzzerInterceptors.cpp @@ -27,7 +27,6 @@ #include <cassert> #include <cstdint> #include <dlfcn.h> // for dlsym() -#include <sanitizer/common_interface_defs.h> static void *getFuncAddr(const char *name, uintptr_t wrapper_addr) { void *addr = dlsym(RTLD_NEXT, name); @@ -119,6 +118,25 @@ static char *internal_strstr(const char *haystack, const char *needle) { extern "C" { +// Weak hooks forward-declared to avoid dependency on +// <sanitizer/common_interface_defs.h>. +void __sanitizer_weak_hook_memcmp(void *called_pc, const void *s1, + const void *s2, size_t n, int result); +void __sanitizer_weak_hook_strncmp(void *called_pc, const char *s1, + const char *s2, size_t n, int result); +void __sanitizer_weak_hook_strncasecmp(void *called_pc, const char *s1, + const char *s2, size_t n, int result); +void __sanitizer_weak_hook_strcmp(void *called_pc, const char *s1, + const char *s2, int result); +void __sanitizer_weak_hook_strcasecmp(void *called_pc, const char *s1, + const char *s2, int result); +void __sanitizer_weak_hook_strstr(void *called_pc, const char *s1, + const char *s2, char *result); +void __sanitizer_weak_hook_strcasestr(void *called_pc, const char *s1, + const char *s2, char *result); +void __sanitizer_weak_hook_memmem(void *called_pc, const void *s1, size_t len1, + const void *s2, size_t len2, void *result); + DEFINE_REAL(int, bcmp, const void *, const void *, size_t) DEFINE_REAL(int, memcmp, const void *, const void *, size_t) DEFINE_REAL(int, strncmp, const char *, const char *, size_t) |