diff options
| author | Dominik Maier <domenukk@gmail.com> | 2021-02-15 15:04:34 +0100 |
|---|---|---|
| committer | Dominik Maier <domenukk@gmail.com> | 2021-02-15 15:04:34 +0100 |
| commit | 145c673a80878d92013882eda6ef56e6948c397b (patch) | |
| tree | a562435e463b9f9d10b8339992d85052f558e4d6 | |
| parent | c5017945f7f3e352d5b29889c6cc7d31d7206fd9 (diff) | |
| download | afl++-145c673a80878d92013882eda6ef56e6948c397b.tar.gz | |
finished merge
| -rw-r--r-- | qemu_mode/libqasan/dlmalloc.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/qemu_mode/libqasan/dlmalloc.c b/qemu_mode/libqasan/dlmalloc.c index 74b05e15..aff58ad5 100644 --- a/qemu_mode/libqasan/dlmalloc.c +++ b/qemu_mode/libqasan/dlmalloc.c @@ -3916,11 +3916,8 @@ static void internal_malloc_stats(mstate m) { clear_smallmap(M, I); \ \ } else if (RTCHECK(B == smallbin_at(M, I) || \ -<<<<<<< HEAD -======= \ \ ->>>>>>> e3a5c31307f323452dc4b5288e0d19a02b596a33 (ok_address(M, B) && B->fd == P))) { \ \ F->bk = B; \ @@ -4131,11 +4128,8 @@ static void internal_malloc_stats(mstate m) { XP->child[1] = R; \ \ } else \ -<<<<<<< HEAD -======= \ \ ->>>>>>> e3a5c31307f323452dc4b5288e0d19a02b596a33 CORRUPTION_ERROR_ACTION(M); \ if (R != 0) { \ \ @@ -4151,11 +4145,8 @@ static void internal_malloc_stats(mstate m) { C0->parent = R; \ \ } else \ -<<<<<<< HEAD -======= \ \ ->>>>>>> e3a5c31307f323452dc4b5288e0d19a02b596a33 CORRUPTION_ERROR_ACTION(M); \ \ } \ @@ -4167,21 +4158,15 @@ static void internal_malloc_stats(mstate m) { C1->parent = R; \ \ } else \ -<<<<<<< HEAD -======= \ \ ->>>>>>> e3a5c31307f323452dc4b5288e0d19a02b596a33 CORRUPTION_ERROR_ACTION(M); \ \ } \ \ } else \ -<<<<<<< HEAD -======= \ \ ->>>>>>> e3a5c31307f323452dc4b5288e0d19a02b596a33 CORRUPTION_ERROR_ACTION(M); \ \ } \ |