persistent replay env setup

3 files changed, 14 insertions, 1 deletions

diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index 9ee59822..7968f69c 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -126,7 +126,7 @@ void afl_fsrv_init_dup(afl_forkserver_t *fsrv_to, afl_forkserver_t *from) {
   fsrv_to->last_run_timed_out = 0;
 
   fsrv_to->init_child_func = from->init_child_func;
-  // Note: do not copy ->add_extra_func
+  // Note: do not copy ->add_extra_func or ->persistent_replay*
 
   list_append(&fsrv_list, fsrv_to);
 
diff --git a/src/afl-fuzz-state.c b/src/afl-fuzz-state.c
index 5040e3ef..075aef1e 100644
--- a/src/afl-fuzz-state.c
+++ b/src/afl-fuzz-state.c
@@ -292,6 +292,13 @@ void read_afl_environment(afl_state_t *afl, char **envp) {
             afl->afl_env.afl_autoresume =
                 get_afl_env(afl_environment_variables[i]) ? 1 : 0;
 
+          } else if (!strncmp(env, "AFL_PERSISTENT_REPLAY",
+
+                              afl_environment_variable_len)) {
+
+            afl->afl_env.afl_persistent_replay =
+                get_afl_env(afl_environment_variables[i]);
+
           } else if (!strncmp(env, "AFL_CYCLE_SCHEDULES",
 
                               afl_environment_variable_len)) {
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index a579a8f5..77e6e2ce 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1239,6 +1239,12 @@ int main(int argc, char **argv_orig, char **envp) {
 
   }
 
+  if (afl->afl_env.afl_persistent_replay) {
+
+    afl->fsrv.persistent_replay = atoi(afl->afl_env.afl_persistent_replay);
+
+  }
+
   if (afl->afl_env.afl_crash_exitcode) {
 
     long exitcode = strtol(afl->afl_env.afl_crash_exitcode, NULL, 10);