Sanitizes launcher tests using AddressSanitizer (#731)

* Sanitizes launcher tests using https://github.com/google/sanitizers/wiki/AddressSanitizer * Update launcher/jvm_tooling.cpp Co-authored-by: Fabian Meumertzheim <[email protected]> * Sanitizes launcher tests using https://github.com/google/sanitizers/wiki/AddressSanitizer --------- Co-authored-by: Fabian Meumertzheim <[email protected]>
CodeIntelligenceTesting · Apr 26, 2023 · d68158d · d68158d
1 parent 88ba6dd
commit d68158d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/launcher/fuzzed_data_provider_test.cpp b/launcher/fuzzed_data_provider_test.cpp
@@ -36,7 +36,8 @@ class FuzzedDataProviderTest : public ::testing::Test {
   // destroyed after all tests in this test suite have finished.
   static void SetUpTestCase() {
     using ::bazel::tools::cpp::runfiles::Runfiles;
-    FLAGS_cp = Runfiles::CreateForTest()->Rlocation(
+    std::unique_ptr<Runfiles> runfiles(Runfiles::CreateForTest());
+    FLAGS_cp = runfiles->Rlocation(
         "jazzer/launcher/testdata/fuzz_target_mocks_deploy.jar");
 
     jvm_ = std::make_unique<JVM>();

diff --git a/launcher/jvm_tooling.cpp b/launcher/jvm_tooling.cpp
@@ -64,16 +64,21 @@ std::string getExecutablePath() {
   char buf[655536];
 #if defined(__APPLE__)
   uint32_t buf_size = sizeof(buf);
-  if (_NSGetExecutablePath(buf, &buf_size) != 0) {
+  uint32_t read_bytes = buf_size - 1;
+  bool failed = (_NSGetExecutablePath(buf, &buf_size) != 0);
 #elif defined(_WIN32)
-  if (GetModuleFileNameA(NULL, buf, sizeof(buf)) == 0) {
+  DWORD read_bytes = GetModuleFileNameA(NULL, buf, sizeof(buf));
+  bool failed = (read_bytes == 0);
 #elif defined(_ANDROID)
-  if (true) {
+  bool failed = true;
 #else  // Assume Linux
-  if (readlink("/proc/self/exe", buf, sizeof(buf)) == -1) {
+  ssize_t read_bytes = readlink("/proc/self/exe", buf, sizeof(buf));
+  bool failed = (read_bytes == -1);
 #endif
+  if (failed) {
     return "";
   }
+  buf[read_bytes] = '\0';
   return {buf};
 }
 

diff --git a/launcher/jvm_tooling_test.cpp b/launcher/jvm_tooling_test.cpp
@@ -36,7 +36,8 @@ class JvmToolingTest : public ::testing::Test {
     FLAGS_jvm_args =
         "-Denv1=va\\" ARG_SEPARATOR "l1\\\\" ARG_SEPARATOR "-Denv2=val2";
     using ::bazel::tools::cpp::runfiles::Runfiles;
-    FLAGS_cp = Runfiles::CreateForTest()->Rlocation(
+    std::unique_ptr<Runfiles> runfiles(Runfiles::CreateForTest());
+    FLAGS_cp = runfiles->Rlocation(
         "jazzer/launcher/testdata/fuzz_target_mocks_deploy.jar");
 
     jvm_ = std::unique_ptr<JVM>(new JVM());