commit 86d0798d4decdb618a8f421c76c603554bab6951
author Yuanfang Chen <yuanfang.chen@sony.com> Mon Feb 10 18:06:17 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 25 23:20:42 2021 -0700
tree 9e29a92338cb3c7793ef160c1a4089613b8a5ee6
parent f563d6eaf585c1d9098ce764683edbc5aaa28bb0

Revert "[NFC][libFuzzer] Prefix TempPath with string showing the work it is doing."

This reverts commit 8a29cb4421f1196bc40c4db5298ca13df516bf19.

fuzzer-linux bot has failure because of this.

GitOrigin-RevId: b1c762398243c3c69e6712aa87bd221e7dc7396a

FuzzerDriver.cpp

diff --git a/FuzzerDriver.cpp b/FuzzerDriver.cpp
index c80e415..0f50450 100644
--- a/FuzzerDriver.cpp
+++ b/FuzzerDriver.cpp
@@ -345,7 +345,7 @@
   assert(Cmd.hasArgument(InputFilePath));
   Cmd.removeArgument(InputFilePath);
 
-  auto TmpFilePath = TempPath("CleanseCrashInput", ".repro");
+  auto TmpFilePath = TempPath(".repro");
   Cmd.addArgument(TmpFilePath);
   Cmd.setOutputFile(getDevNull());
   Cmd.combineOutAndErr();
@@ -499,7 +499,7 @@
   std::sort(OldCorpus.begin(), OldCorpus.end());
   std::sort(NewCorpus.begin(), NewCorpus.end());
 
-  std::string CFPath = CFPathOrNull ? CFPathOrNull : TempPath("Merge", ".txt");
+  std::string CFPath = CFPathOrNull ? CFPathOrNull : TempPath(".txt");
   Vector<std::string> NewFiles;
   Set<uint32_t> NewFeatures, NewCov;
   CrashResistantMerge(Args, OldCorpus, NewCorpus, &NewFiles, {}, &NewFeatures,

FuzzerFork.cpp

diff --git a/FuzzerFork.cpp b/FuzzerFork.cpp
index d9e6b79..95ed365 100644
--- a/FuzzerFork.cpp
+++ b/FuzzerFork.cpp
@@ -297,7 +297,7 @@
   for (auto &Dir : CorpusDirs)
     GetSizedFilesFromDir(Dir, &SeedFiles);
   std::sort(SeedFiles.begin(), SeedFiles.end());
-  Env.TempDir = TempPath("FuzzWithFork", ".dir");
+  Env.TempDir = TempPath(".dir");
   Env.DFTDir = DirPlusFile(Env.TempDir, "DFT");
   RmDirRecursive(Env.TempDir);  // in case there is a leftover from old runs.
   MkDir(Env.TempDir);

FuzzerIO.cpp

diff --git a/FuzzerIO.cpp b/FuzzerIO.cpp
index ae4c703..f070816 100644
--- a/FuzzerIO.cpp
+++ b/FuzzerIO.cpp
@@ -151,8 +151,9 @@
       [](const std::string &Path) { RemoveFile(Path); });
 }
 
-std::string TempPath(const char *Prefix, const char *Extension) {
-  return DirPlusFile(TmpDir(), Prefix + std::to_string(GetPid()) + Extension);
+std::string TempPath(const char *Extension) {
+  return DirPlusFile(TmpDir(),
+                     "libFuzzerTemp." + std::to_string(GetPid()) + Extension);
 }
 
 }  // namespace fuzzer

FuzzerIO.h

diff --git a/FuzzerIO.h b/FuzzerIO.h
index 6e4368b..ae8dd24 100644
--- a/FuzzerIO.h
+++ b/FuzzerIO.h
@@ -42,7 +42,7 @@
 // Returns path to a TmpDir.
 std::string TmpDir();
 
-std::string TempPath(const char *Prefix, const char *Extension);
+std::string TempPath(const char *Extension);
 
 bool IsInterestingCoverageFile(const std::string &FileName);
 

FuzzerLoop.cpp

diff --git a/FuzzerLoop.cpp b/FuzzerLoop.cpp
index 09f319d..451a4c1 100644
--- a/FuzzerLoop.cpp
+++ b/FuzzerLoop.cpp
@@ -256,7 +256,7 @@
 void Fuzzer::MaybeExitGracefully() {
   if (!F->GracefulExitRequested) return;
   Printf("==%lu== INFO: libFuzzer: exiting as requested\n", GetPid());
-  RmDirRecursive(TempPath("FuzzWithFork", ".dir"));
+  RmDirRecursive(TempPath(".dir"));
   F->PrintFinalStats();
   _Exit(0);
 }
@@ -265,7 +265,7 @@
   Printf("==%lu== libFuzzer: run interrupted; exiting\n", GetPid());
   PrintFinalStats();
   ScopedDisableMsanInterceptorChecks S; // RmDirRecursive may call opendir().
-  RmDirRecursive(TempPath("FuzzWithFork", ".dir"));
+  RmDirRecursive(TempPath(".dir"));
   // Stop right now, don't perform any at-exit actions.
   _Exit(Options.InterruptExitCode);
 }