[PATCH] D54180: [fuzzer] Read files as binary

[Jonathan Metzman via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rCRT346279: [fuzzer] Read files as binary (authored by metzman, committed by ).
Herald added subscribers: Sanitizers, llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D54180?vs=172868&id=172869#toc

Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D54180

Files:
  lib/fuzzer/FuzzerIO.cpp
  lib/fuzzer/afl/afl_driver.cpp
  test/fuzzer/ReadBinaryTest.cpp
  test/fuzzer/read-binary.test


Index: test/fuzzer/ReadBinaryTest.cpp
===================================================================
--- test/fuzzer/ReadBinaryTest.cpp
+++ test/fuzzer/ReadBinaryTest.cpp
@@ -0,0 +1,18 @@
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+
+// Simple test for a fuzzer. Tests that fuzzer can read a file containing
+// carriage returns.
+#include <cstddef>
+#include <cstdint>
+#include <iostream>
+#include <string>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
+  std::string InputStr(reinterpret_cast<const char*>(Data), Size);
+  std::string MagicStr("Hello\r\nWorld\r\n");
+  if (InputStr == MagicStr) {
+    std::cout << "BINGO!";
+  }
+  return 0;
+}
Index: test/fuzzer/read-binary.test
===================================================================
--- test/fuzzer/read-binary.test
+++ test/fuzzer/read-binary.test
@@ -0,0 +1,7 @@
+# Test that libFuzzer reads files properly.
+
+# Account for the fact that echo will add a trailing newline.
+RUN: echo -e "Hello\r\nWorld\r" > %t-testcase
+RUN: %cpp_compiler %S/ReadBinaryTest.cpp -o %t-fuzzer
+RUN: %run %t-fuzzer %t-testcase | FileCheck %s
+CHECK: BINGO!
Index: lib/fuzzer/afl/afl_driver.cpp
===================================================================
--- lib/fuzzer/afl/afl_driver.cpp
+++ lib/fuzzer/afl/afl_driver.cpp
@@ -289,7 +289,7 @@
 // Execute any files provided as parameters.
 int ExecuteFilesOnyByOne(int argc, char **argv) {
   for (int i = 1; i < argc; i++) {
-    std::ifstream in(argv[i]);
+    std::ifstream in(argv[i], std::ios::binary);
     in.seekg(0, in.end);
     size_t length = in.tellg();
     in.seekg (0, in.beg);
Index: lib/fuzzer/FuzzerIO.cpp
===================================================================
--- lib/fuzzer/FuzzerIO.cpp
+++ lib/fuzzer/FuzzerIO.cpp
@@ -31,7 +31,7 @@
 }
 
 Unit FileToVector(const std::string &Path, size_t MaxSize, bool ExitOnError) {
-  std::ifstream T(Path);
+  std::ifstream T(Path, std::ios::binary);
   if (ExitOnError && !T) {
     Printf("No such directory: %s; exiting\n", Path.c_str());
     exit(1);
@@ -51,7 +51,7 @@
 }
 
 std::string FileToString(const std::string &Path) {
-  std::ifstream T(Path);
+  std::ifstream T(Path, std::ios::binary);
   return std::string((std::istreambuf_iterator<char>(T)),
                      std::istreambuf_iterator<char>());
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54180.172869.patch
Type: text/x-patch
Size: 2413 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181106/e9044a02/attachment.bin>