aboutsummaryrefslogtreecommitdiff
path: root/include/alloc-inl.h
diff options
context:
space:
mode:
authorMark <mteffeteller@google.com>2024-03-30 00:11:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-03-30 00:11:12 +0000
commit16a86b9f07350eee05053a3592d9a22f8cf18f79 (patch)
treeae0e5e5f1bc5b1b1362b14eadd2649868dc7cdf9 /include/alloc-inl.h
parentc2b8c40179dff9f3b772ec1a6663d08730ea5ef4 (diff)
parent5c891e9c31cf7e1148e73150ad8008d5d2606686 (diff)
downloadAFLplusplus-main.tar.gz
Merge commit '775861ea94d00672c9e868db329073afd699b994' into tmp_auto_upgrade am: 5c891e9c31HEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/AFLplusplus/+/3018568 Change-Id: Iffbbde5be49eaafc493bd5beb015af47ccfebe7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'include/alloc-inl.h')
-rw-r--r--include/alloc-inl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/alloc-inl.h b/include/alloc-inl.h
index 1e9a192b..0aa417be 100644
--- a/include/alloc-inl.h
+++ b/include/alloc-inl.h
@@ -10,7 +10,7 @@
Dominik Maier <mail@dmnk.co>
Copyright 2016, 2017 Google Inc. All rights reserved.
- Copyright 2019-2023 AFLplusplus Project. All rights reserved.
+ Copyright 2019-2024 AFLplusplus Project. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -322,7 +322,7 @@ static inline void DFL_ck_free(void *mem) {
static inline void *DFL_ck_realloc(void *orig, u32 size) {
void *ret;
- u32 old_size = 0;
+ u32 old_size = 0;
if (!size) {
@@ -392,7 +392,7 @@ static inline void *DFL_ck_realloc(void *orig, u32 size) {
static inline u8 *DFL_ck_strdup(u8 *str) {
void *ret;
- u32 size;
+ u32 size;
if (!str) return NULL;
@@ -438,14 +438,14 @@ struct TRK_obj {
void *ptr;
char *file, *func;
- u32 line;
+ u32 line;
};
#ifdef AFL_MAIN
struct TRK_obj *TRK[ALLOC_BUCKETS];
-u32 TRK_cnt[ALLOC_BUCKETS];
+u32 TRK_cnt[ALLOC_BUCKETS];
#define alloc_report() TRK_report()