fix: Return unsorted vulnerabilities in new HashSet, avoiding CoMod#7848
Merged
nhumblot merged 2 commits intodependency-check:mainfrom Aug 6, 2025
Merged
fix: Return unsorted vulnerabilities in new HashSet, avoiding CoMod#7848nhumblot merged 2 commits intodependency-check:mainfrom
nhumblot merged 2 commits intodependency-check:mainfrom
Conversation
Collaborator
nhumblot
approved these changes
Aug 6, 2025
Collaborator
nhumblot
left a comment
There was a problem hiding this comment.
I checked the callers of the updated method and did not see any call to Set<Vulnerability> getVulnerabilities(boolean sorted) that would try to add a new Vulnerability to the returned Set<Vulnerability>.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change
Dependency.java getVulnerabilities(boolean sorted) method when sorted=false returns the vulnerabilities HashSet global to the Dependency object. It is returned wrapped in an UnmodifiableSet, but this does not protect against concurrent modifications as it just wraps the original set. Any future calls to add or remove vulnerabilities will proceed, as we are outside the synchronized methods, while someone is potentially iterating over the UnmodifiableSet retrieved earlier.
I came across this intermittent issue during my builds while in AbstractNpmAnalyzer.replaceOrAddVulnerability. I assume one AbstractNpmAnalyzer instance is performing a stream.anyMatch on the Set while another instance, or some other mechanism, is adding or removing vulnerabilities from the same dependency.
Note: In this same line of code (AbstractNpmAnalyzer.replaceOrAddVulnerability) there is another stream operation to locate references for a vulnerability by name, however I think the references Set is thread-safe. It also uses Collections.unmodifiableSet, but in this case the Set being wrapped is ConcurrentHashMap.newKeySet which should remain thread-safe. A similar approach could be taken in Dependency.java with the vulnerabilitySet, but would be more invasive.
Related issues
[ERROR]
java.util.ConcurrentModificationException
at java.util.HashMap$KeySpliterator.tryAdvance (HashMap.java:1738)
at java.util.stream.ReferencePipeline.forEachWithCancel (ReferencePipeline.java:129)
at java.util.stream.AbstractPipeline.copyIntoWithCancel (AbstractPipeline.java:527)
at java.util.stream.AbstractPipeline.copyInto (AbstractPipeline.java:513)
at java.util.stream.AbstractPipeline.wrapAndCopyInto (AbstractPipeline.java:499)
at java.util.stream.MatchOps$MatchOp.evaluateSequential (MatchOps.java:230)
at java.util.stream.MatchOps$MatchOp.evaluateSequential (MatchOps.java:196)
at java.util.stream.AbstractPipeline.evaluate (AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.anyMatch (ReferencePipeline.java:632)
at org.owasp.dependencycheck.analyzer.AbstractNpmAnalyzer.replaceOrAddVulnerability (AbstractNpmAnalyzer.java:508)
at org.owasp.dependencycheck.analyzer.AbstractNpmAnalyzer.processResults (AbstractNpmAnalyzer.java:494)
at org.owasp.dependencycheck.analyzer.NodeAuditAnalyzer.analyzeDependency (NodeAuditAnalyzer.java:151)
at org.owasp.dependencycheck.analyzer.AbstractAnalyzer.analyze (AbstractAnalyzer.java:131)
at org.owasp.dependencycheck.AnalysisTask.call (AnalysisTask.java:88)
at org.owasp.dependencycheck.AnalysisTask.call (AnalysisTask.java:37)
at java.util.concurrent.FutureTask.run (FutureTask.java:317)
at java.util.concurrent.ThreadPoolExecutor.runWorker (ThreadPoolExecutor.java:1144)
at java.util.concurrent.ThreadPoolExecutor$Worker.run (ThreadPoolExecutor.java:642)
at java.lang.Thread.run (Thread.java:1583)
Have test cases been added to cover the new functionality?
no