[llvm] r292685 - [libFuzzer] use print+exit(1) instead of assert to report an error

Kostya Serebryany via llvm-commits llvm-commits at lists.llvm.org
Fri Jan 20 16:13:51 PST 2017


Author: kcc
Date: Fri Jan 20 18:13:50 2017
New Revision: 292685

URL: http://llvm.org/viewvc/llvm-project?rev=292685&view=rev
Log:
[libFuzzer] use print+exit(1) instead of assert to report an error

Modified:
    llvm/trunk/lib/Fuzzer/FuzzerDriver.cpp
    llvm/trunk/lib/Fuzzer/test/fuzzer.test

Modified: llvm/trunk/lib/Fuzzer/FuzzerDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerDriver.cpp?rev=292685&r1=292684&r2=292685&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerDriver.cpp (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerDriver.cpp Fri Jan 20 18:13:50 2017
@@ -365,8 +365,10 @@ int FuzzerDriver(int *argc, char ***argv
   const std::vector<std::string> Args(*argv, *argv + *argc);
   assert(!Args.empty());
   ProgName = new std::string(Args[0]);
-  assert(Argv0 == *ProgName &&
-         "argv[0] has been modified in LLVMFuzzerInitialize");
+  if (Argv0 != *ProgName) {
+    Printf("ERROR: argv[0] has been modified in LLVMFuzzerInitialize\n");
+    exit(1);
+  }
   ParseFlags(Args);
   if (Flags.help) {
     PrintHelp();

Modified: llvm/trunk/lib/Fuzzer/test/fuzzer.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/test/fuzzer.test?rev=292685&r1=292684&r2=292685&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/test/fuzzer.test (original)
+++ llvm/trunk/lib/Fuzzer/test/fuzzer.test Fri Jan 20 18:13:50 2017
@@ -56,5 +56,5 @@ STRNCMP: AddressSanitizer: heap-buffer-o
 STRNCMP-NOT: __sanitizer_weak_hook_strncmp
 STRNCMP: in LLVMFuzzerTestOneInput
 
-RUN: not --crash LLVMFuzzer-BogusInitializeTest 2>&1 | FileCheck %s --check-prefix=BOGUS_INITIALIZE
+RUN: not LLVMFuzzer-BogusInitializeTest 2>&1 | FileCheck %s --check-prefix=BOGUS_INITIALIZE
 BOGUS_INITIALIZE: argv[0] has been modified in LLVMFuzzerInitialize




More information about the llvm-commits mailing list