Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore JetBrains classes during instrumentation #763

Merged
merged 2 commits into from
Jun 12, 2023
Merged

Ignore JetBrains classes during instrumentation #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eb2637
Ignore JetBrains classes during instrumentation
bertschneider Jun 12, 2023
954aef0
Prevent NPE on failed bytecode lookup
bertschneider Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/com/code_intelligence/jazzer/agent/RuntimeInstrumentor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,10 @@ class RuntimeInstrumentor(
.acceptClasses(className)
.scan()
.use {
it.getClassInfo(className).resource.load()
it.getClassInfo(className)?.resource?.load() ?: run {
bertschneider marked this conversation as resolved.
Show resolved Hide resolved
Log.warn("Failed to load bytecode of class $className")
return null
}
}
val (instrumentedBytecode, duration) = measureTimedValue {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/code_intelligence/jazzer/junit/AgentConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private static void applyCommonConfiguration() {
// Do not hook common IDE and JUnit classes and their dependencies.
System.setProperty("jazzer.custom_hook_excludes",
String.join(File.pathSeparator, "com.google.testing.junit.**", "com.intellij.**",
"io.github.classgraph.**", "junit.framework.**", "net.bytebuddy.**",
"org.jetbrains.**", "io.github.classgraph.**", "junit.framework.**", "net.bytebuddy.**",
"org.apiguardian.**", "org.assertj.core.**", "org.hamcrest.**", "org.junit.**",
"org.opentest4j.**", "org.mockito.**", "org.apache.maven.**", "org.gradle.**"));
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/code_intelligence/jazzer/utils/ClassNameGlobber.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ private val BASE_EXCLUDED_CLASS_NAME_GLOBS = listOf(
"org.junit.**", // dependency of @FuzzTest
"org.mockito.**", // can cause instrumentation cycles
"net.bytebuddy.**", // ignore Byte Buddy, though it's probably shaded
"org.jetbrains.**", // ignore JetBrains products (coverage agent)
) + if (IS_BAZEL_COVERAGE_RUN) ADDITIONAL_EXCLUDED_NAME_GLOBS_FOR_BAZEL_COVERAGE else listOf()

class ClassNameGlobber(includes: List<String>, excludes: List<String>) {
Expand Down