diff options
| author | Mitch Phillips <mitchp@google.com> | 2022-04-21 18:58:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 18:58:06 +0000 |
| commit | 75011e6012b87b29511b6e02a8c6f76478880723 (patch) | |
| tree | 83444dc13350002b184abc67dfe911475f675b7e /libc/bionic/malloc_common.cpp | |
| parent | aa4f3198c8b8e784c17496833f69dcf832c97adb (diff) | |
| parent | a6b526a12dcd3e979c986da1fa59b1f8e4aac24d (diff) | |
Merge "[GWP-ASan] Provide runtime configuration through an env var + sysprop." am: 3865c8f942 am: a6b526a12d
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2038947
Change-Id: Ied5425fb8fc770c4e2cfa22ff4747a8941a850e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libc/bionic/malloc_common.cpp')
| -rw-r--r-- | libc/bionic/malloc_common.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/bionic/malloc_common.cpp b/libc/bionic/malloc_common.cpp index 38168eeec..9744968fc 100644 --- a/libc/bionic/malloc_common.cpp +++ b/libc/bionic/malloc_common.cpp @@ -326,12 +326,12 @@ extern "C" bool android_mallopt(int opcode, void* arg, size_t arg_size) { return LimitEnable(arg, arg_size); } if (opcode == M_INITIALIZE_GWP_ASAN) { - if (arg == nullptr || arg_size != sizeof(bool)) { + if (arg == nullptr || arg_size != sizeof(android_mallopt_gwp_asan_options_t)) { errno = EINVAL; return false; } - return EnableGwpAsan(*reinterpret_cast<bool*>(arg)); + return EnableGwpAsan(*reinterpret_cast<android_mallopt_gwp_asan_options_t*>(arg)); } errno = ENOTSUP; return false; |