Initialize CloseGuard for legacy synthetic DexFiles - #177
Merged
Conversation
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.
Problem
The pre-Android O generated-dex fallback allocates
dalvik.system.DexFilewithAllocObjectsoit can attach an in-memory ART dex. On API 21-25 this bypasses the constructor's initialization of
the private
CloseGuard guardfield. Finalization later callsclose()and throws aNullPointerExceptionfromCloseGuard.close().Fix
Resolve
CloseGuard.get()and the legacyDexFile.guardfield duringDexFile::Init, then seed afresh guard on every synthetic object returned by
ToJavaDexFile. If any framework contract ismissing, initialization fails closed and LSPlant remains unavailable on that runtime.
Evidence
the six fixture logs contained no
DexFile.finalize/CloseGuard.closeNPEs. The broader fixtureharness still reported no-bound rows, so this is not presented as a complete compatibility pass.