diff options
| author | Maik Betka <9078425+voidptr127@users.noreply.github.com> | 2023-04-21 11:31:22 +0200 |
|---|---|---|
| committer | Maik Betka <9078425+voidptr127@users.noreply.github.com> | 2023-04-21 11:31:22 +0200 |
| commit | 7101ffa1ae79e15d70905b09decbe69cdf53367b (patch) | |
| tree | fd34b5686a4522dd6d29c9a40cee3d9826b2c7c6 /qemu_mode/libqasan/malloc.c | |
| parent | 9ab902402cd33156257fc0355c0105e7e03f5ba3 (diff) | |
| parent | 4e5f42cab6b8c501eeaf76ec7ca920089f6e0f3a (diff) | |
| download | afl++-7101ffa1ae79e15d70905b09decbe69cdf53367b.tar.gz | |
Merge remote-tracking branch 'origin/dev' into atnwalk
# Conflicts: # include/afl-fuzz.h # src/afl-fuzz-run.c
Diffstat (limited to 'qemu_mode/libqasan/malloc.c')
| -rw-r--r-- | qemu_mode/libqasan/malloc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qemu_mode/libqasan/malloc.c b/qemu_mode/libqasan/malloc.c index c83b5eb2..d2db3856 100644 --- a/qemu_mode/libqasan/malloc.c +++ b/qemu_mode/libqasan/malloc.c @@ -1,5 +1,5 @@ /******************************************************************************* -Copyright (c) 2019-2022, Andrea Fioraldi +Copyright (c) 2019-2023, Andrea Fioraldi Redistribution and use in source and binary forms, with or without @@ -306,9 +306,7 @@ int __libqasan_posix_memalign(void **ptr, size_t align, size_t len) { } - size_t rem = len % align; - size_t size = len; - if (rem) size += rem; + size_t size = len + align; int state = QASAN_SWAP(QASAN_DISABLED); // disable qasan for this thread |