diff --git a/MODULE.bazel b/MODULE.bazel index 45336f7e8..60c106921 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,27 +7,27 @@ module(name = "jazzer") ################################################################################ bazel_dep(name = "abseil-cpp", version = "20250814.1") -bazel_dep(name = "apple_support", version = "1.24.3") +bazel_dep(name = "apple_support", version = "1.24.5") bazel_dep(name = "bazel_jar_jar", version = "0.1.11") bazel_dep(name = "bazel_skylib", version = "1.8.2") -bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2") +bazel_dep(name = "buildifier_prebuilt", version = "8.2.1") # TODO: Starting with version 0.28.0 the JUnit test runner is compiled for Java 11 which breaks our JDK 8 tests. # https://github.com/bazel-contrib/rules_jvm/pull/307 bazel_dep(name = "contrib_rules_jvm", version = "0.27.0") -bazel_dep(name = "googletest", version = "1.17.0.bcr.1") +bazel_dep(name = "googletest", version = "1.17.0.bcr.2") bazel_dep(name = "platforms", version = "1.0.0") -bazel_dep(name = "protobuf", version = "33.0") +bazel_dep(name = "protobuf", version = "33.1") bazel_dep(name = "rules_android", version = "0.6.6") bazel_dep(name = "rules_android_ndk", version = "0.1.3") bazel_dep(name = "rules_foreign_cc", version = "0.15.1") -bazel_dep(name = "rules_java", version = "8.16.1") +bazel_dep(name = "rules_java", version = "9.1.0") bazel_dep(name = "rules_jni", version = "0.11.1") -bazel_dep(name = "rules_jvm_external", version = "6.8") -bazel_dep(name = "rules_kotlin", version = "2.1.9") +bazel_dep(name = "rules_jvm_external", version = "6.9") +bazel_dep(name = "rules_kotlin", version = "2.2.0") bazel_dep(name = "rules_license", version = "1.0.0") bazel_dep(name = "rules_pkg", version = "1.1.0") -bazel_dep(name = "rules_cc", version = "0.2.13") +bazel_dep(name = "rules_cc", version = "0.2.14") bazel_dep(name = "toolchains_llvm", version = "1.5.0") ################################################################################ diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index eb9168377..07e30e325 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -326,7 +326,6 @@ java_fuzz_target_test( "src/main/java/com/example/JsonSanitizerValidJsonFuzzer.java", ], allowed_findings = ["com.code_intelligence.jazzer.api.FuzzerSecurityIssueLow"], - expected_warning_or_error = "WARN: Some hooks could not be applied to class files built for Java 7 or lower.", target_class = "com.example.JsonSanitizerValidJsonFuzzer", deps = [ "@maven//:com_google_code_gson_gson", diff --git a/examples/junit/src/test/java/com/example/ValidFuzzTests.java b/examples/junit/src/test/java/com/example/ValidFuzzTests.java index 9641380f1..9c2f4f7f3 100644 --- a/examples/junit/src/test/java/com/example/ValidFuzzTests.java +++ b/examples/junit/src/test/java/com/example/ValidFuzzTests.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.regex.Pattern; -@SuppressWarnings("InvalidPatternSyntax") +@SuppressWarnings({"InvalidPatternSyntax", "ReturnValueIgnored"}) class ValidFuzzTests { @FuzzTest void dataFuzz(FuzzedDataProvider data) { diff --git a/maven_install.json b/maven_install.json index e12caf3d0..be22bce14 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,11 +1,18 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 287537767, - "__RESOLVED_ARTIFACTS_HASH": 786120758, + "__INPUT_ARTIFACTS_HASH": 426637406, + "__RESOLVED_ARTIFACTS_HASH": 232640174, "conflict_resolution": { - "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9", + "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.10.1", + "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.10.1", + "com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.44.0", + "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.44.0", + "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.5.0-android", + "com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.5.0-android", "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.1", - "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0" + "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0", + "com.google.truth:truth:1.4.0": "com.google.truth:truth:1.4.5", + "org.mockito:mockito-core:5.4.0": "org.mockito:mockito-core:5.20.0" }, "artifacts": { "com.alibaba:fastjson": { @@ -70,9 +77,9 @@ }, "com.google.code.gson:gson": { "shasums": { - "jar": "d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e" + "jar": "4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593" }, - "version": "2.8.9" + "version": "2.10.1" }, "com.google.errorprone:error_prone_annotations": { "shasums": { diff --git a/sanitizers/src/test/java/com/example/ClassLoaderLoadClass.java b/sanitizers/src/test/java/com/example/ClassLoaderLoadClass.java index 299279db5..6861e76cd 100644 --- a/sanitizers/src/test/java/com/example/ClassLoaderLoadClass.java +++ b/sanitizers/src/test/java/com/example/ClassLoaderLoadClass.java @@ -19,6 +19,7 @@ import com.code_intelligence.jazzer.api.FuzzedDataProvider; public class ClassLoaderLoadClass { + @SuppressWarnings("ReturnValueIgnored") public static void fuzzerTestOneInput(FuzzedDataProvider data) throws InterruptedException { String input = data.consumeRemainingAsAsciiString(); try { diff --git a/sanitizers/src/test/java/com/example/DisabledHooksTest.java b/sanitizers/src/test/java/com/example/DisabledHooksTest.java index 76a5e7554..af3bdec1e 100644 --- a/sanitizers/src/test/java/com/example/DisabledHooksTest.java +++ b/sanitizers/src/test/java/com/example/DisabledHooksTest.java @@ -26,6 +26,7 @@ import org.junit.Test; public class DisabledHooksTest { + @SuppressWarnings("ReturnValueIgnored") public static void triggerReflectiveCallSanitizer() { try { Class.forName("jaz.Zer").newInstance(); diff --git a/sanitizers/src/test/java/com/example/ReflectiveCall.java b/sanitizers/src/test/java/com/example/ReflectiveCall.java index 2883c7bc0..cc3e58851 100644 --- a/sanitizers/src/test/java/com/example/ReflectiveCall.java +++ b/sanitizers/src/test/java/com/example/ReflectiveCall.java @@ -19,6 +19,7 @@ import com.code_intelligence.jazzer.api.FuzzedDataProvider; public class ReflectiveCall { + @SuppressWarnings("ReturnValueIgnored") public static void fuzzerTestOneInput(FuzzedDataProvider data) { String input = data.consumeRemainingAsAsciiString(); if (input.startsWith("@")) { diff --git a/sanitizers/src/test/java/com/example/RegexSplitInjection.java b/sanitizers/src/test/java/com/example/RegexSplitInjection.java index 88df1deaf..590ec21ae 100644 --- a/sanitizers/src/test/java/com/example/RegexSplitInjection.java +++ b/sanitizers/src/test/java/com/example/RegexSplitInjection.java @@ -20,6 +20,7 @@ import java.util.regex.PatternSyntaxException; public class RegexSplitInjection { + @SuppressWarnings("ReturnValueIgnored") public static void fuzzerTestOneInput(FuzzedDataProvider fdp) { String regex = fdp.consumeRemainingAsString(); try { diff --git a/tests/src/test/java/com/example/PrimitiveTypeCompareHookFuzzer.java b/tests/src/test/java/com/example/PrimitiveTypeCompareHookFuzzer.java index 6051dfc71..3ef1428e5 100644 --- a/tests/src/test/java/com/example/PrimitiveTypeCompareHookFuzzer.java +++ b/tests/src/test/java/com/example/PrimitiveTypeCompareHookFuzzer.java @@ -23,6 +23,7 @@ * Regression test for https://github.com/CodeIntelligenceTesting/jazzer/issues/790. */ public class PrimitiveTypeCompareHookFuzzer { + @SuppressWarnings("ReturnValueIgnored") public static void fuzzerTestOneInput(FuzzedDataProvider data) { Byte.compare(data.consumeByte(), (byte) 127); Short.compare(data.consumeShort(), (short) 4096);