diff options
author | van Hauser <vh@thc.org> | 2020-12-15 09:39:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-15 09:39:10 +0100 |
commit | 8e712d1a740b30f9e2d5655d97d4cac6e8aed543 (patch) | |
tree | 912ea1a05ba03709563b9ebea43957cd9a463fbf /include | |
parent | 12d62d539353517abee8069df6e591f4fc474e93 (diff) | |
parent | 149ec41e9039d79420088c6de7bfc7feba5fe937 (diff) | |
download | afl++-8e712d1a740b30f9e2d5655d97d4cac6e8aed543.tar.gz |
Merge pull request #628 from AFLplusplus/dev 3.0c
Final push to stable
Diffstat (limited to 'include')
-rw-r--r-- | include/alloc-inl.h | 3 | ||||
-rw-r--r-- | include/config.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/alloc-inl.h b/include/alloc-inl.h index 68255fb6..3044b7a0 100644 --- a/include/alloc-inl.h +++ b/include/alloc-inl.h @@ -94,7 +94,8 @@ static inline void *DFL_ck_alloc_nozero(u32 size) { } -/* Allocate a buffer, returning zeroed memory. */ +/* Allocate a buffer, returning zeroed memory. + Returns null for 0 size */ static inline void *DFL_ck_alloc(u32 size) { diff --git a/include/config.h b/include/config.h index 491d8132..93249ed9 100644 --- a/include/config.h +++ b/include/config.h @@ -28,7 +28,7 @@ /* Version string: */ // c = release, d = volatile github dev, e = experimental branch -#define VERSION "++3.00a" +#define VERSION "++3.00c" /****************************************************** * * |