<div dir="ltr">This broke libFuzzer on Windows: <div><a href="http://lab.llvm.org:8011/builders/sanitizer-windows/builds/14306/steps/run%20fuzzer%20tests/logs/stdio">http://lab.llvm.org:8011/builders/sanitizer-windows/builds/14306/steps/run%20fuzzer%20tests/logs/stdio</a></div><div>I may not have time to look at this today, sadly. </div><div><pre style="font-family:"Courier New",courier,monotype,monospace;color:rgb(0,0,0);font-size:medium"><span class="gmail-stdout">FAIL: LLVMFuzzer :: fuzzer-flags.test (14 of 92)
******************** TEST 'LLVMFuzzer :: fuzzer-flags.test' FAILED ********************
Script:
--
LLVMFuzzer-FlagsTest -foo_bar=1 2>&1 | FileCheck C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test --check-prefix=FOO_BAR
LLVMFuzzer-FlagsTest -runs=10 --max_len=100 2>&1 | FileCheck C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test --check-prefix=DASH_DASH
LLVMFuzzer-FlagsTest -help=1 2>&1 | FileCheck C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test --check-prefix=NO_INTERNAL
LLVMFuzzer-FlagsTest --foo-bar -runs=10 -ignore_remaining_args=1 --baz -help=1 test 2>&1 | FileCheck C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test --check-prefix=PASSTHRU
mkdir -p C:\b\slave\sanitizer-windows\build-fuzzer\lib\Fuzzer\test\Output\fuzzer-flags.test.tmp/T0 C:\b\slave\sanitizer-windows\build-fuzzer\lib\Fuzzer\test\Output\fuzzer-flags.test.tmp/T1
touch C:\b\slave\sanitizer-windows\build-fuzzer\lib\Fuzzer\test\Output\fuzzer-flags.test.tmp/T1/empty
LLVMFuzzer-FlagsTest --foo-bar -merge=1 C:\b\slave\sanitizer-windows\build-fuzzer\lib\Fuzzer\test\Output\fuzzer-flags.test.tmp/T0 C:\b\slave\sanitizer-windows\build-fuzzer\lib\Fuzzer\test\Output\fuzzer-flags.test.tmp/T1 -ignore_remaining_args=1 --baz -help=1 test 2>&1 | FileCheck C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test --check-prefix=PASSTHRU-MERGE
--
Exit Code: 1
Command Output (stdout):
--
$ "LLVMFuzzer-FlagsTest" "-foo_bar=1"
$ "FileCheck" "C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test" "--check-prefix=FOO_BAR"
$ "LLVMFuzzer-FlagsTest" "-runs=10" "--max_len=100"
$ "FileCheck" "C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test" "--check-prefix=DASH_DASH"
$ "LLVMFuzzer-FlagsTest" "-help=1"
$ "FileCheck" "C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test" "--check-prefix=NO_INTERNAL"
$ "LLVMFuzzer-FlagsTest" "--foo-bar" "-runs=10" "-ignore_remaining_args=1" "--baz" "-help=1" "test"
$ "FileCheck" "C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test" "--check-prefix=PASSTHRU"
# command stderr:
C:\b\slave\sanitizer-windows\llvm\lib\Fuzzer\test\fuzzer-flags.test:13:11: error: expected string not found in input
PASSTHRU: BINGO --foo-bar --baz -help=1 test
^
<stdin>:1:1: note: scanning from here
INFO: libFuzzer ignores flags that start with '--'
^
error: command failed with exit status: 1
--
********************
Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. </span></pre><div><br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jul 14, 2017 at 4:33 PM, Justin Bogner via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: bogner<br>
Date: Fri Jul 14 16:33:04 2017<br>
New Revision: 308069<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=308069&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=308069&view=rev</a><br>
Log:<br>
[libFuzzer] Allow non-fuzzer args after -ignore_remaining_args=1<br>
<br>
With this change, libFuzzer will ignore any arguments after a sigil<br>
argument, but it will preserve these arguments at the end of the<br>
command line when launching subprocesses. Using this, its possible to<br>
handle positional and single-dash arguments to the program under test<br>
by discarding everything up to -ignore_remaining_args=1 in<br>
LLVMFuzzerInitialize.<br>
<br>
Added:<br>
llvm/trunk/lib/Fuzzer/test/<wbr>FlagsTest.cpp<br>
Modified:<br>
llvm/trunk/lib/Fuzzer/<wbr>FuzzerDriver.cpp<br>
llvm/trunk/lib/Fuzzer/<wbr>FuzzerFlags.def<br>
llvm/trunk/lib/Fuzzer/<wbr>FuzzerMerge.cpp<br>
llvm/trunk/lib/Fuzzer/<wbr>FuzzerUtil.h<br>
llvm/trunk/lib/Fuzzer/test/<wbr>CMakeLists.txt<br>
llvm/trunk/lib/Fuzzer/test/<wbr>fuzzer-flags.test<br>
<br>
Modified: llvm/trunk/lib/Fuzzer/<wbr>FuzzerDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerDriver.cpp?rev=308069&r1=308068&r2=308069&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>FuzzerDriver.cpp?rev=308069&<wbr>r1=308068&r2=308069&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/<wbr>FuzzerDriver.cpp (original)<br>
+++ llvm/trunk/lib/Fuzzer/<wbr>FuzzerDriver.cpp Fri Jul 14 16:33:04 2017<br>
@@ -186,7 +186,11 @@ static void ParseFlags(const std::vector<br>
}<br>
Inputs = new std::vector<std::string>;<br>
for (size_t A = 1; A < Args.size(); A++) {<br>
- if (ParseOneFlag(Args[A].c_str())<wbr>) continue;<br>
+ if (ParseOneFlag(Args[A].c_str())<wbr>) {<br>
+ if (Flags.ignore_remaining_args)<br>
+ break;<br>
+ continue;<br>
+ }<br>
Inputs->push_back(Args[A]);<br>
}<br>
}<br>
@@ -356,16 +360,17 @@ int MinimizeCrashInput(const std::vector<br>
exit(1);<br>
}<br>
std::string InputFilePath = Inputs->at(0);<br>
- std::string BaseCmd =<br>
- CloneArgsWithoutX(Args, "minimize_crash", "exact_artifact_path");<br>
- auto InputPos = BaseCmd.find(" " + InputFilePath + " ");<br>
+ auto BaseCmd = SplitBefore(<br>
+ "-ignore_remaining_args=1",<br>
+ CloneArgsWithoutX(Args, "minimize_crash", "exact_artifact_path"));<br>
+ auto InputPos = BaseCmd.first.find(" " + InputFilePath + " ");<br>
assert(InputPos != std::string::npos);<br>
- BaseCmd.erase(InputPos, InputFilePath.size() + 1);<br>
+ BaseCmd.first.erase(InputPos, InputFilePath.size() + 1);<br>
if (Flags.runs <= 0 && Flags.max_total_time == 0) {<br>
Printf("INFO: you need to specify -runs=N or "<br>
"-max_total_time=N with -minimize_crash=1\n"<br>
"INFO: defaulting to -max_total_time=600\n");<br>
- BaseCmd += " -max_total_time=600";<br>
+ BaseCmd.first += " -max_total_time=600";<br>
}<br>
<br>
auto LogFilePath = DirPlusFile(<br>
@@ -378,7 +383,8 @@ int MinimizeCrashInput(const std::vector<br>
Printf("CRASH_MIN: minimizing crash input: '%s' (%zd bytes)\n",<br>
CurrentFilePath.c_str(), U.size());<br>
<br>
- auto Cmd = BaseCmd + " " + CurrentFilePath + LogFileRedirect;<br>
+ auto Cmd = BaseCmd.first + " " + CurrentFilePath + LogFileRedirect + " " +<br>
+ BaseCmd.second;<br>
<br>
Printf("CRASH_MIN: executing: %s\n", Cmd.c_str());<br>
int ExitCode = ExecuteCommand(Cmd);<br>
<br>
Modified: llvm/trunk/lib/Fuzzer/<wbr>FuzzerFlags.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerFlags.def?rev=308069&r1=308068&r2=308069&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>FuzzerFlags.def?rev=308069&r1=<wbr>308068&r2=308069&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/<wbr>FuzzerFlags.def (original)<br>
+++ llvm/trunk/lib/Fuzzer/<wbr>FuzzerFlags.def Fri Jul 14 16:33:04 2017<br>
@@ -121,6 +121,9 @@ FUZZER_FLAG_STRING(exit_on_<wbr>src_pos, "Exi<br>
FUZZER_FLAG_STRING(exit_on_<wbr>item, "Exit if an item with a given sha1 sum"<br>
" was added to the corpus. "<br>
"Used primarily for testing libFuzzer itself.")<br>
+FUZZER_FLAG_INT(ignore_<wbr>remaining_args, 0, "If 1, ignore all arguments passed "<br>
+ "after this one. Useful for fuzzers that need to do their own "<br>
+ "argument parsing.")<br>
<br>
FUZZER_FLAG_STRING(run_<wbr>equivalence_server, "Experimental")<br>
FUZZER_FLAG_STRING(use_<wbr>equivalence_server, "Experimental")<br>
<br>
Modified: llvm/trunk/lib/Fuzzer/<wbr>FuzzerMerge.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerMerge.cpp?rev=308069&r1=308068&r2=308069&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>FuzzerMerge.cpp?rev=308069&r1=<wbr>308068&r2=308069&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/<wbr>FuzzerMerge.cpp (original)<br>
+++ llvm/trunk/lib/Fuzzer/<wbr>FuzzerMerge.cpp Fri Jul 14 16:33:04 2017<br>
@@ -285,12 +285,13 @@ void Fuzzer::CrashResistantMerge(<wbr>const s<br>
<br>
// Execute the inner process untill it passes.<br>
// Every inner process should execute at least one input.<br>
- std::string BaseCmd = CloneArgsWithoutX(Args, "keep-all-flags");<br>
+ auto BaseCmd = SplitBefore("-ignore_<wbr>remaining_args=1",<br>
+ CloneArgsWithoutX(Args, "keep-all-flags"));<br>
bool Success = false;<br>
for (size_t i = 1; i <= AllFiles.size(); i++) {<br>
Printf("MERGE-OUTER: attempt %zd\n", i);<br>
- auto ExitCode =<br>
- ExecuteCommand(BaseCmd + " -merge_control_file=" + CFPath);<br>
+ auto ExitCode = ExecuteCommand(BaseCmd.first + " -merge_control_file=" +<br>
+ CFPath + " " + BaseCmd.second);<br>
if (!ExitCode) {<br>
Printf("MERGE-OUTER: succesfull in %zd attempt(s)\n", i);<br>
Success = true;<br>
<br>
Modified: llvm/trunk/lib/Fuzzer/<wbr>FuzzerUtil.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerUtil.h?rev=308069&r1=308068&r2=308069&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>FuzzerUtil.h?rev=308069&r1=<wbr>308068&r2=308069&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/<wbr>FuzzerUtil.h (original)<br>
+++ llvm/trunk/lib/Fuzzer/<wbr>FuzzerUtil.h Fri Jul 14 16:33:04 2017<br>
@@ -67,6 +67,14 @@ inline std::string CloneArgsWithoutX(con<br>
return CloneArgsWithoutX(Args, X, X);<br>
}<br>
<br>
+inline std::pair<std::string, std::string> SplitBefore(std::string X,<br>
+ std::string S) {<br>
+ auto Pos = S.find(X);<br>
+ if (Pos == std::string::npos)<br>
+ return std::make_pair(S, "");<br>
+ return std::make_pair(S.substr(0, Pos), S.substr(Pos));<br>
+}<br>
+<br>
std::string DisassembleCmd(const std::string &FileName);<br>
<br>
std::string SearchRegexCmd(const std::string &Regex);<br>
<br>
Modified: llvm/trunk/lib/Fuzzer/test/<wbr>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/test/CMakeLists.txt?rev=308069&r1=308068&r2=308069&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>test/CMakeLists.txt?rev=<wbr>308069&r1=308068&r2=308069&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/test/<wbr>CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/Fuzzer/test/<wbr>CMakeLists.txt Fri Jul 14 16:33:04 2017<br>
@@ -90,6 +90,7 @@ set(Tests<br>
EmptyTest<br>
EquivalenceATest<br>
EquivalenceBTest<br>
+ FlagsTest<br>
FourIndependentBranchesTest<br>
FullCoverageSetTest<br>
InitializeTest<br>
<br>
Added: llvm/trunk/lib/Fuzzer/test/<wbr>FlagsTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/test/FlagsTest.cpp?rev=308069&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>test/FlagsTest.cpp?rev=308069&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/test/<wbr>FlagsTest.cpp (added)<br>
+++ llvm/trunk/lib/Fuzzer/test/<wbr>FlagsTest.cpp Fri Jul 14 16:33:04 2017<br>
@@ -0,0 +1,32 @@<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+<br>
+// Parse some flags<br>
+#include <string><br>
+#include <vector><br>
+<br>
+static std::vector<std::string> Flags;<br>
+<br>
+extern "C" int LLVMFuzzerInitialize(int *Argc, char ***Argv) {<br>
+ // Parse --flags and anything after -ignore_remaining_args=1 is passed.<br>
+ int I = 1;<br>
+ while (I < *Argc) {<br>
+ std::string S((*Argv)[I++]);<br>
+ if (S == "-ignore_remaining_args=1")<br>
+ break;<br>
+ if (S.substr(0, 2) == "--")<br>
+ Flags.push_back(S);<br>
+ }<br>
+ while (I < *Argc)<br>
+ Flags.push_back(std::string((*<wbr>Argv)[I++]));<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {<br>
+ fprintf(stderr, "BINGO ");<br>
+ for (auto Flag : Flags)<br>
+ fprintf(stderr, "%s ", Flag.c_str());<br>
+ fprintf(stderr, "\n");<br>
+ exit(0);<br>
+}<br>
<br>
Modified: llvm/trunk/lib/Fuzzer/test/<wbr>fuzzer-flags.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/test/fuzzer-flags.test?rev=308069&r1=308068&r2=308069&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Fuzzer/<wbr>test/fuzzer-flags.test?rev=<wbr>308069&r1=308068&r2=308069&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Fuzzer/test/<wbr>fuzzer-flags.test (original)<br>
+++ llvm/trunk/lib/Fuzzer/test/<wbr>fuzzer-flags.test Fri Jul 14 16:33:04 2017<br>
@@ -1,10 +1,18 @@<br>
-RUN: LLVMFuzzer-SimpleTest -foo_bar=1 2>&1 | FileCheck %s --check-prefix=FOO_BAR<br>
+RUN: LLVMFuzzer-FlagsTest -foo_bar=1 2>&1 | FileCheck %s --check-prefix=FOO_BAR<br>
FOO_BAR: WARNING: unrecognized flag '-foo_bar=1'; use -help=1 to list all flags<br>
FOO_BAR: BINGO<br>
<br>
-RUN: LLVMFuzzer-SimpleTest -runs=10 --max_len=100 2>&1 | FileCheck %s --check-prefix=DASH_DASH<br>
+RUN: LLVMFuzzer-FlagsTest -runs=10 --max_len=100 2>&1 | FileCheck %s --check-prefix=DASH_DASH<br>
DASH_DASH: WARNING: did you mean '-max_len=100' (single dash)?<br>
DASH_DASH: INFO: A corpus is not provided, starting from an empty corpus<br>
<br>
-RUN: LLVMFuzzer-SimpleTest -help=1 2>&1 | FileCheck %s --check-prefix=NO_INTERNAL<br>
+RUN: LLVMFuzzer-FlagsTest -help=1 2>&1 | FileCheck %s --check-prefix=NO_INTERNAL<br>
NO_INTERNAL-NOT: internal flag<br>
+<br>
+RUN: LLVMFuzzer-FlagsTest --foo-bar -runs=10 -ignore_remaining_args=1 --baz -help=1 test 2>&1 | FileCheck %s --check-prefix=PASSTHRU<br>
+PASSTHRU: BINGO --foo-bar --baz -help=1 test<br>
+<br>
+RUN: mkdir -p %t/T0 %t/T1<br>
+RUN: touch %t/T1/empty<br>
+RUN: LLVMFuzzer-FlagsTest --foo-bar -merge=1 %t/T0 %t/T1 -ignore_remaining_args=1 --baz -help=1 test 2>&1 | FileCheck %s --check-prefix=PASSTHRU-MERGE<br>
+PASSTHRU-MERGE: BINGO --foo-bar --baz -help=1 test<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>