Potentially fix google#64

Author: Andrew Ferraiuolo

fuzztest/internal/coverage.cc

@@ -23,10 +23,10 @@
 #include <memory>
 #include <type_traits>
 
-#include "absl/base/attributes.h"
-#include "absl/types/span.h"
 #include "./fuzztest/internal/logging.h"
 #include "./fuzztest/internal/table_of_recent_compares.h"
+#include "absl/base/attributes.h"
+#include "absl/types/span.h"
 
 namespace fuzztest::internal {
 namespace {
@@ -268,8 +268,7 @@ extern "C" void __sanitizer_cov_8bit_counters_init(uint8_t* start,
 // This function should have no external library dependencies to prevent
 // accidental coverage instrumentation.
 template <int data_size>
-ABSL_ATTRIBUTE_ALWAYS_INLINE   // To make __builtin_return_address(0) work.
-    GOOGLEFUZZTEST_NOSANITIZE  // To skip arg1 - arg2 overflow.
+GOOGLEFUZZTEST_NOSANITIZE  // To skip arg1 - arg2 overflow.
     void
     TraceCmp(uint64_t arg1, uint64_t arg2, uint8_t argsize_bit,
              uintptr_t PC =
@@ -288,7 +287,7 @@ ABSL_ATTRIBUTE_ALWAYS_INLINE   // To make __builtin_return_address(0) work.
 
 // Use NO_SANITIZE_MEMORY and ADDRESS to skip possible errors on reading buffer.
 GOOGLEFUZZTEST_NOSANITIZE
-static size_t InternalStrnlen(const char *s, size_t n) {
+static size_t InternalStrnlen(const char* s, size_t n) {
   size_t len = 0;
   while (len < n && s[len]) {
     len++;
@@ -297,7 +296,7 @@ static size_t InternalStrnlen(const char *s, size_t n) {
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-static size_t InternalStrlen(const char *s1, const char *s2) {
+static size_t InternalStrlen(const char* s1, const char* s2) {
   size_t len = 0;
   while (s1[len] && s2[len]) {
     len++;
@@ -306,7 +305,7 @@ static size_t InternalStrlen(const char *s1, const char *s2) {
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-static void TraceMemCmp(const uint8_t *s1, const uint8_t *s2, size_t n,
+static void TraceMemCmp(const uint8_t* s1, const uint8_t* s2, size_t n,
                         int result) {
   // Non-interesting cases.
   if (n <= 1 || result == 0) return;
@@ -345,7 +344,7 @@ void __sanitizer_cov_trace_cmp8(uint64_t Arg1, uint64_t Arg2) {
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-void __sanitizer_cov_trace_switch(uint64_t Val, uint64_t *Cases) {
+void __sanitizer_cov_trace_switch(uint64_t Val, uint64_t* Cases) {
   uintptr_t PC = reinterpret_cast<uintptr_t>(__builtin_return_address(0));
   switch (Cases[0]) {
     case 8:
@@ -374,45 +373,45 @@ void __sanitizer_cov_trace_switch(uint64_t Val, uint64_t *Cases) {
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-void __sanitizer_weak_hook_strcasecmp(void *, const char *s1, const char *s2,
+void __sanitizer_weak_hook_strcasecmp(void*, const char* s1, const char* s2,
                                       int result) {
   if (s1 == nullptr || s2 == nullptr) return;
   size_t n = InternalStrlen(s1, s2);
-  TraceMemCmp(reinterpret_cast<const uint8_t *>(s1),
-              reinterpret_cast<const uint8_t *>(s2), n, result);
+  TraceMemCmp(reinterpret_cast<const uint8_t*>(s1),
+              reinterpret_cast<const uint8_t*>(s2), n, result);
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-void __sanitizer_weak_hook_memcmp(void *, const void *s1, const void *s2,
+void __sanitizer_weak_hook_memcmp(void*, const void* s1, const void* s2,
                                   size_t n, int result) {
   if (s1 == nullptr || s2 == nullptr) return;
-  TraceMemCmp(reinterpret_cast<const uint8_t *>(s1),
-              reinterpret_cast<const uint8_t *>(s2), n, result);
+  TraceMemCmp(reinterpret_cast<const uint8_t*>(s1),
+              reinterpret_cast<const uint8_t*>(s2), n, result);
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-void __sanitizer_weak_hook_strncmp(void *, const char *s1, const char *s2,
+void __sanitizer_weak_hook_strncmp(void*, const char* s1, const char* s2,
                                    size_t n, int result) {
   if (s1 == nullptr || s2 == nullptr) return;
   size_t len1 = InternalStrnlen(s1, n);
   size_t len2 = InternalStrnlen(s2, n);
   n = std::min(std::min(n, len1), len2);
-  TraceMemCmp(reinterpret_cast<const uint8_t *>(s1),
-              reinterpret_cast<const uint8_t *>(s2), n, result);
+  TraceMemCmp(reinterpret_cast<const uint8_t*>(s1),
+              reinterpret_cast<const uint8_t*>(s2), n, result);
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-void __sanitizer_weak_hook_strcmp(void *, const char *s1, const char *s2,
+void __sanitizer_weak_hook_strcmp(void*, const char* s1, const char* s2,
                                   int result) {
   if (s1 == nullptr || s2 == nullptr) return;
   size_t n = InternalStrlen(s1, s2);
-  TraceMemCmp(reinterpret_cast<const uint8_t *>(s1),
-              reinterpret_cast<const uint8_t *>(s2), n, result);
+  TraceMemCmp(reinterpret_cast<const uint8_t*>(s1),
+              reinterpret_cast<const uint8_t*>(s2), n, result);
 }
 
 GOOGLEFUZZTEST_NOSANITIZE
-void __sanitizer_weak_hook_strncasecmp(void *caller_pc, const char *s1,
-                                       const char *s2, size_t n, int result) {
+void __sanitizer_weak_hook_strncasecmp(void* caller_pc, const char* s1,
+                                       const char* s2, size_t n, int result) {
   if (s1 == nullptr || s2 == nullptr) return;
   return __sanitizer_weak_hook_strncmp(caller_pc, s1, s2, n, result);
 }