[PATCH] D60008: Use binary write mode in WriteToFile function to avoid appended \r characters on Windows

[Vitaly Buka via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL357807: Use binary write mode in WriteToFile function to avoid appended \r characters… (authored by vitalybuka, committed by ).
Herald added a subscriber: delcypher.

Changed prior to commit:
  https://reviews.llvm.org/D60008?vs=193043&id=193955#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D60008/new/

https://reviews.llvm.org/D60008

Files:
  compiler-rt/trunk/lib/fuzzer/FuzzerIO.cpp
  compiler-rt/trunk/test/fuzzer/ReloadTest.cpp
  compiler-rt/trunk/test/fuzzer/reload.test


Index: compiler-rt/trunk/test/fuzzer/ReloadTest.cpp
===================================================================
--- compiler-rt/trunk/test/fuzzer/ReloadTest.cpp
+++ compiler-rt/trunk/test/fuzzer/ReloadTest.cpp
@@ -0,0 +1,24 @@
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+// Test that fuzzer we can reload artifacts with any bytes inside.
+#include <algorithm>
+#include <cstdint>
+#include <numeric>
+#include <set>
+#include <stdio.h>
+
+extern "C" size_t LLVMFuzzerCustomMutator(uint8_t *Data, size_t Size,
+                                          size_t MaxSize, unsigned int Seed) {
+  std::srand(Seed);
+  std::generate(Data, Data + MaxSize, std::rand);
+  return MaxSize;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+  if (Size > 5000 && std::set<uint8_t>(Data, Data + Size).size() > 255 &&
+      (uint8_t)std::accumulate(Data, Data + Size, uint8_t(Size)) == 0)
+    __builtin_trap();
+  return 0;
+}
Index: compiler-rt/trunk/test/fuzzer/reload.test
===================================================================
--- compiler-rt/trunk/test/fuzzer/reload.test
+++ compiler-rt/trunk/test/fuzzer/reload.test
@@ -0,0 +1,13 @@
+RUN: %cpp_compiler %S/ReloadTest.cpp -o %t-ReloadTest
+RUN: not %run %t-ReloadTest -max_len=10000 -seed=1 -timeout=15 -len_control=0 -exact_artifact_path=%t.crash 2>&1 | FileCheck %s
+
+CHECK: Test unit written to {{.*}}reload.test.tmp.crash
+
+RUN: not %run %t-ReloadTest %t.crash 2>&1 | FileCheck %s --check-prefix=ARTIFACT
+
+ARTIFACT: Running: {{.*}}reload.test.tmp.crash
+ARTIFACT: ERROR: libFuzzer: deadly signal
+
+# Sanity check that altered artifact is not going to crash
+RUN: echo z >> %t.crash
+RUN: %run %t-ReloadTest %t.crash
Index: compiler-rt/trunk/lib/fuzzer/FuzzerIO.cpp
===================================================================
--- compiler-rt/trunk/lib/fuzzer/FuzzerIO.cpp
+++ compiler-rt/trunk/lib/fuzzer/FuzzerIO.cpp
@@ -62,7 +62,7 @@
 
 void WriteToFile(const Unit &U, const std::string &Path) {
   // Use raw C interface because this function may be called from a sig handler.
-  FILE *Out = fopen(Path.c_str(), "w");
+  FILE *Out = fopen(Path.c_str(), "wb");
   if (!Out) return;
   fwrite(U.data(), sizeof(U[0]), U.size(), Out);
   fclose(Out);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60008.193955.patch
Type: text/x-patch
Size: 2425 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190405/c36ba500/attachment.bin>