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.

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

Excluded locking on java.lang.Class objects from SSD bug #1984

Merged
merged 2 commits into from Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -8,6 +8,7 @@ Currently the versioning policy of this project follows [Semantic Versioning v2.
### Fixed
- Bumped Saxon-HE from 10.6 to 11.2 ([#1955](https://github.com/spotbugs/spotbugs/pull/1955))
- Fixed traversal of nested archives governed by `-nested:true` ([#1930](https://github.com/spotbugs/spotbugs/pull/1930))
- Fixed false positive SSD bug for locking on java.lang.Class objects ([#1978](https://github.com/spotbugs/spotbugs/issues/1978))

## 4.6.0 - 2022-03-08
### Fixed
Expand Down
Expand Up @@ -29,6 +29,13 @@ public void findSSDBugInClass_InstanceLevelSynchronizedMethod() {
assertSSDBug("InstanceLevelSynchronizedMethod", "methodWithBug", 10);
}

@Test
public void findNoSSDBugInClass_LockingOnJavaLangClassObject() {
performAnalysis("instanceLockOnSharedStaticData/LockingOnJavaLangClassObject.class");

assertNumOfSSDBugs(0);
}

@Test
public void findNoSSDBugInClass_StaticLockObjectOnStaticSharedData() {
performAnalysis("instanceLockOnSharedStaticData/StaticLockObjectOnStaticSharedData.class");
Expand Down
Expand Up @@ -25,22 +25,25 @@
import edu.umd.cs.findbugs.ba.XField;
import edu.umd.cs.findbugs.ba.XMethod;
import edu.umd.cs.findbugs.bcel.OpcodeStackDetector;
import org.apache.bcel.Const;
import org.apache.bcel.classfile.JavaClass;

import java.util.Optional;
import java.util.stream.Stream;
import org.apache.bcel.Const;
import org.apache.bcel.classfile.JavaClass;

public class FindInstanceLockOnSharedStaticData extends OpcodeStackDetector {

private static final String JAVA_LANG_CLASS = "java.lang.Class";

private final BugAccumulator bugAccumulator;
private boolean isInsideSynchronizedBlock;
private Optional<XField> maybeLockObject;
private boolean isLockObjectInstanceOfJavaLangClass;

public FindInstanceLockOnSharedStaticData(BugReporter bugReporter) {
this.bugAccumulator = new BugAccumulator(bugReporter);
isInsideSynchronizedBlock = false;
maybeLockObject = Optional.empty();
isLockObjectInstanceOfJavaLangClass = false;
}

@Override
Expand All @@ -50,6 +53,18 @@ public void sawOpcode(int seen) {
isInsideSynchronizedBlock = true;
OpcodeStack.Item lockObject = stack.getStackItem(0);
maybeLockObject = Optional.ofNullable(lockObject.getXField());

// Locking on java.lang.Class objects is appropriate, since there is only a single instance of them
if (!maybeLockObject.isPresent()) {
try {
Optional<JavaClass> javaClassOfLockObject = Optional.ofNullable(lockObject.getJavaClass());
isLockObjectInstanceOfJavaLangClass = javaClassOfLockObject
.map(javaClass -> javaClass.getClassName().equals(JAVA_LANG_CLASS))
.orElse(false);
} catch (ClassNotFoundException ignored) {
}
}

return;
} else if (seen == Const.MONITOREXIT) {
isInsideSynchronizedBlock = false;
Expand All @@ -72,7 +87,8 @@ public void sawOpcode(int seen) {
return;
}

boolean isLockObjectAppropriate = maybeLockObject.map(XField::isStatic).orElse(false);
boolean isLockObjectAppropriate = maybeLockObject.map(XField::isStatic).orElse(false)
|| isLockObjectInstanceOfJavaLangClass;
if (fieldToModify.isPresent() && isInsideSynchronizedBlock && !isLockObjectAppropriate) {
bugAccumulator.accumulateBug(
new BugInstance(this, "SSD_DO_NOT_USE_INSTANCE_LOCK_ON_SHARED_STATIC_DATA", NORMAL_PRIORITY)
Expand All @@ -98,6 +114,7 @@ public void visit(JavaClass obj) {
if (classIsInteresting) {
isInsideSynchronizedBlock = false;
maybeLockObject = Optional.empty();
isLockObjectInstanceOfJavaLangClass = false;
super.visit(obj);
}
}
Expand Down
@@ -0,0 +1,11 @@
package instanceLockOnSharedStaticData;

public class LockingOnJavaLangClassObject {
private static int counter = 0;

public static int incrementCounter() {
synchronized (LockingOnJavaLangClassObject.class) {
return counter++;
}
}
}