Re-validate entries in PredicatedMap/PredicatedCollection readObject#682
Merged
garydgregory merged 3 commits intoJun 17, 2026
Merged
Conversation
garydgregory
requested changes
Jun 15, 2026
garydgregory
requested changes
Jun 16, 2026
garydgregory
left a comment
Member
There was a problem hiding this comment.
Hello @rootvector2
Please see my comment.
garydgregory
added a commit
that referenced
this pull request
Jun 17, 2026
(#682). - Sort members - Less vertical space
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PredicatedMap.readObjectandPredicatedCollection.readObjectrebuild the decorated map/collection straight from the stream and never re-run the predicate that the constructors apply to every element. A serialized form whose backing data was not produced throughput/add(a tampered or hand-built stream) therefore deserializes into a decorator that holds elements its own predicate rejects. APredicatedMapcreated withNotNullPredicateto forbid null keys, for instance, can be made to contain a null key, and code that trusts the decorator's guarantee then breaks.I found this while checking the decorators'
readObjectpaths against the invariant their constructors enforce (map.forEach(this::validate)/ the per-element loop).The fix re-validates each deserialized entry/element against the configured predicate and throws
InvalidObjectExceptionon a violation, mirroring the constructor.PredicatedSortedMapand thePredicatedList/PredicatedSet/PredicatedBag/PredicatedQueue/PredicatedMultiSet/PredicatedNavigableSetdecorators inherit the check through these two base classes, so the whole predicated family is covered. TheTransformed*decorators are intentionally left alone: their stored values are already transformed, so re-running the transformer on read would transform twice.Existing serialized forms still load (the version-4 compatibility tests pass); only streams carrying predicate-violating data are now rejected.
Before you push a pull request, review this list:
mvn; that'smvnon the command line by itself.