test: Fix fuzzer compilation on macOS

freenancial · freenancial · commit c8992e89594a · 2020-07-21T15:23:49.000-07:00
fixes #19557
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
@@ -332,7 +332,7 @@ class FuzzedFileProvider
             return 0;
         }
         std::memcpy(buf, random_bytes.data(), random_bytes.size());
-        if (AdditionOverflow((uint64_t)fuzzed_file->m_offset, random_bytes.size())) {
+        if (AdditionOverflow(fuzzed_file->m_offset, (int64_t)random_bytes.size())) {
             return fuzzed_file->m_fuzzed_data_provider.ConsumeBool() ? 0 : -1;
         }
         fuzzed_file->m_offset += random_bytes.size();
@@ -343,7 +343,7 @@ class FuzzedFileProvider
     {
         FuzzedFileProvider* fuzzed_file = (FuzzedFileProvider*)cookie;
         const ssize_t n = fuzzed_file->m_fuzzed_data_provider.ConsumeIntegralInRange<ssize_t>(0, size);
-        if (AdditionOverflow(fuzzed_file->m_offset, n)) {
+        if (AdditionOverflow(fuzzed_file->m_offset, (int64_t)n)) {
             return fuzzed_file->m_fuzzed_data_provider.ConsumeBool() ? 0 : -1;
         }
         fuzzed_file->m_offset += n;

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ class FuzzedFileProvider`
`332`	`332`	`return 0;`
`333`	`333`	`}`
`334`	`334`	`std::memcpy(buf, random_bytes.data(), random_bytes.size());`
`335`		`- if (AdditionOverflow((uint64_t)fuzzed_file->m_offset, random_bytes.size())) {`
	`335`	`+ if (AdditionOverflow(fuzzed_file->m_offset, (int64_t)random_bytes.size())) {`
`336`	`336`	`return fuzzed_file->m_fuzzed_data_provider.ConsumeBool() ? 0 : -1;`
`337`	`337`	`}`
`338`	`338`	`fuzzed_file->m_offset += random_bytes.size();`
`@@ -343,7 +343,7 @@ class FuzzedFileProvider`
`343`	`343`	`{`
`344`	`344`	`FuzzedFileProvider* fuzzed_file = (FuzzedFileProvider*)cookie;`
`345`	`345`	`const ssize_t n = fuzzed_file->m_fuzzed_data_provider.ConsumeIntegralInRange<ssize_t>(0, size);`
`346`		`- if (AdditionOverflow(fuzzed_file->m_offset, n)) {`
	`346`	`+ if (AdditionOverflow(fuzzed_file->m_offset, (int64_t)n)) {`
`347`	`347`	`return fuzzed_file->m_fuzzed_data_provider.ConsumeBool() ? 0 : -1;`
`348`	`348`	`}`
`349`	`349`	`fuzzed_file->m_offset += n;`