From 570fc24ed38623ab0fec544e027ab204759fa0d8 Mon Sep 17 00:00:00 2001
From: Thomas HUET <git@thomash.fr>
Date: Sun, 24 Jul 2016 16:21:00 +0200
Subject: [PATCH] 2.19b

---
 afl-as.h       | 2 +-
 afl-fuzz.c     | 9 +++++++--
 config.h       | 2 +-
 docs/ChangeLog | 9 ++++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/afl-as.h b/afl-as.h
index 9c6e5032..ebd57109 100644
--- a/afl-as.h
+++ b/afl-as.h
@@ -98,7 +98,7 @@
    of every .c file. This should have no impact in any practical sense.
 
    Another side effect of this design is that getenv() will be called once per
-   every .o file when running in non-instrumented mode; an since getenv() tends
+   every .o file when running in non-instrumented mode; and since getenv() tends
    to be optimized in funny ways, we need to be very careful to save every
    oddball register it may touch.
 
diff --git a/afl-fuzz.c b/afl-fuzz.c
index ea49eda5..f915f002 100644
--- a/afl-fuzz.c
+++ b/afl-fuzz.c
@@ -5131,7 +5131,7 @@ static u8 fuzz_one(char** argv) {
   /* Effector map setup. These macros calculate:
 
      EFF_APOS      - position of a particular file offset in the map.
-     EFF_ALEN      - length of an map with a particular number of bytes.
+     EFF_ALEN      - length of n map with a particular number of bytes.
      EFF_SPAN_ALEN - map span for a sequence of bytes.
 
    */
@@ -7551,13 +7551,18 @@ int main(int argc, char** argv) {
   u8  *extras_dir = 0;
   u8  mem_limit_given = 0;
   u8  exit_1 = !!getenv("AFL_BENCH_JUST_ONE");
-
   char** use_argv;
 
+  struct timeval tv;
+  struct timezone tz;
+
   SAYF(cCYA "afl-fuzz " cBRI VERSION cRST " by <lcamtuf@google.com>\n");
 
   doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH;
 
+  gettimeofday(&tv, &tz);
+  srandom(tv.tv_sec ^ tv.tv_usec ^ getpid());
+
   while ((opt = getopt(argc, argv, "+i:o:f:m:t:T:dnCB:S:M:x:Q")) > 0)
 
     switch (opt) {
diff --git a/config.h b/config.h
index 32863f14..ce91b5ba 100644
--- a/config.h
+++ b/config.h
@@ -21,7 +21,7 @@
 
 /* Version string: */
 
-#define VERSION             "2.18b"
+#define VERSION             "2.19b"
 
 /******************************************************
  *                                                    *
diff --git a/docs/ChangeLog b/docs/ChangeLog
index e9154898..2ac12144 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -16,6 +16,13 @@ Not sure if you should upgrade? The lowest currently recommended version
 is 2.18b. If you're stuck on an earlier release, it's strongly advisable
 to get on with the times.
 
+--------------
+Version 2.19b:
+--------------
+
+  - Made a fix to make sure that auto CPU binding happens at non-overlapping
+    times.
+
 --------------
 Version 2.18b:
 --------------
@@ -1503,7 +1510,7 @@ Version 0.88b:
   - Refactored the code slightly to make more frequent updates to fuzzer_stats
     and to provide more detail about synchronization.
 
-  - Added a fflush(stdout) call for non-tty operation, as requested by 
+  - Added an fflush(stdout) call for non-tty operation, as requested by 
     Joonas Kuorilehto.
 
   - Added some detail to fuzzer_stats for parity with plot_file.