From fe3a4176375e031893c6e9718143b085794e7684 Mon Sep 17 00:00:00 2001
From: Alex Groce <agroce@gmail.com>
Date: Fri, 27 Jul 2018 21:10:02 -0700
Subject: [PATCH] special version for libFuzzer that doesn't fork

---
 src/include/deepstate/DeepState.h | 42 +++++++++++++++++++++++++++++++
 src/lib/DeepState.c               |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/include/deepstate/DeepState.h b/src/include/deepstate/DeepState.h
index 8a24179..f3bb41b 100644
--- a/src/include/deepstate/DeepState.h
+++ b/src/include/deepstate/DeepState.h
@@ -491,6 +491,48 @@ static void DeepState_RunTest(struct DeepState_TestInfo *test) {
   }
 }
 
+/* Run a test case, but in libFuzzer, so not inside a fork. */
+static void DeepState_RunTestLLVM(struct DeepState_TestInfo *test) {
+  /* Run the test. */
+  if (!setjmp(DeepState_ReturnToRun)) {
+    /* Convert uncaught C++ exceptions into a test failure. */
+#if defined(__cplusplus) && defined(__cpp_exceptions)
+    try {
+#endif  /* __cplusplus */
+
+      test->test_func();  /* Run the test function. */
+      return(DeepState_TestRunPass);
+
+#if defined(__cplusplus) && defined(__cpp_exceptions)
+    } catch(...) {
+      DeepState_Fail();
+    }
+#endif  /* __cplusplus */
+
+    /* We caught a failure when running the test. */
+  } else if (DeepState_CatchFail()) {
+    DeepState_LogFormat(DeepState_LogError, "Failed: %s", test->test_name);
+    if (HAS_FLAG_output_test_dir) {
+      DeepState_SaveFailingTest();
+    }
+    return(DeepState_TestRunFail);
+
+    /* The test was abandoned. We may have gotten soft failures before
+     * abandoning, so we prefer to catch those first. */
+  } else if (DeepState_CatchAbandoned()) {
+    DeepState_LogFormat(DeepState_LogError, "Abandoned: %s", test->test_name);
+    return(DeepState_TestRunAbandon);
+
+    /* The test passed. */
+  } else {
+    DeepState_LogFormat(DeepState_LogInfo, "Passed: %s", test->test_name);
+    if (HAS_FLAG_output_test_dir) {
+      DeepState_SavePassingTest();
+    }
+    return(DeepState_TestRunPass);
+  }
+}
+
 /* Fork and run `test`. */
 static enum DeepState_TestRunResult
 DeepState_ForkAndRunTest(struct DeepState_TestInfo *test) {
diff --git a/src/lib/DeepState.c b/src/lib/DeepState.c
index 79b733f..b8a49da 100644
--- a/src/lib/DeepState.c
+++ b/src/lib/DeepState.c
@@ -573,7 +573,7 @@ extern int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
 
   DeepState_Begin(test);
 
-  enum DeepState_TestRunResult result = DeepState_ForkAndRunTest(test);
+  enum DeepState_TestRunResult result = DeepState_RunTestLLVM(test);
 
   DeepState_Teardown();