Skip to content

Commit

Permalink
2.35b
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-huet committed Sep 29, 2016
1 parent 74130d3 commit f1eab7c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 3 deletions.
3 changes: 2 additions & 1 deletion afl-fuzz.c
Original file line number Diff line number Diff line change
Expand Up @@ -7661,7 +7661,7 @@ int main(int argc, char** argv) {
u8* c;

if (sync_id) FATAL("Multiple -S or -M options not supported");
sync_id = optarg;
sync_id = ck_strdup(optarg);

if ((c = strchr(sync_id, ':'))) {

Expand Down Expand Up @@ -7991,6 +7991,7 @@ int main(int argc, char** argv) {
destroy_queue();
destroy_extras();
ck_free(target_path);
ck_free(sync_id);

alloc_report();

Expand Down
2 changes: 1 addition & 1 deletion config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

/* Version string: */

#define VERSION "2.34b"
#define VERSION "2.35b"

/******************************************************
* *
Expand Down
8 changes: 8 additions & 0 deletions docs/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ Not sure if you should upgrade? The lowest currently recommended version
is 2.31b. If you're stuck on an earlier release, it's strongly advisable
to get on with the times.

--------------
Version 2.35b:
--------------

- Fixed a minor cmdline reporting glitch, spotted by Leo Barnes.

- Fixed a silly bug in libdislocator. Spotted by Johannes Schultz.

--------------
Version 2.34b:
--------------
Expand Down
7 changes: 7 additions & 0 deletions docs/sister_projects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ afl-cov (Michael Rash)

https://github.com/mrash/afl-cov

afl-sancov (Bhargava Shastry)
-----------------------------

Similar to afl-cov, but uses clang sanitizer instrumentation.

https://github.com/bshastry/afl-sancov

RecidiVM (Jakub Wilk)
---------------------

Expand Down
3 changes: 2 additions & 1 deletion libdislocator/libdislocator.so.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ static void* __dislocator_alloc(size_t len) {

void* ret;

if (total_mem + len > max_mem) {

if (total_mem + len > max_mem || total_mem + len <= total_mem) {

if (hard_fail)
FATAL("total allocs exceed %u MB", max_mem / 1024 / 1024);
Expand Down

0 comments on commit f1eab7c

Please sign in to comment.