fix: resolve #1195 — 【Update@2019-12-18】ART内联或AOT导致VerifyError及其他类型的闪退#1790
Open
Nam0101 wants to merge 3 commits into
Open
Conversation
…及其他类型的闪退 Fixes Tencent#1195 Signed-off-by: Nguyen Van Nam <nam.nv205106@gmail.com>
…及其他类型的闪退 Fixes Tencent#1195 Signed-off-by: Nguyen Van Nam <nam.nv205106@gmail.com>
…及其他类型的闪退 Fixes Tencent#1195 Signed-off-by: Nguyen Van Nam <nam.nv205106@gmail.com>
Member
|
|
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
2 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.
Summary
fix: resolve #1195 — 【Update@2019-12-18】ART内联或AOT导致VerifyError及其他类型的闪退
Problem
Severity:
High| File:third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dex/io/DexDataBuffer.javaDexDataBuffer is the low-level writer used by all section serializers in DexDiff/DexPatch. If any caller forgets to call alignment before writing an aligned section (specifically after variable-length encoded sections like ClassDataItem, EncodedArrayItem, AnnotationItem), the resulting dex layout has misaligned offsets which Android P's verifier rejects.
Solution
Add a robust
alignToFourBytesWithZeroFill()method (or verify it exists and is correct, padding with 0x00). Audit all callers inDex.java,DexWriter, and the various section visitors (ClassDataItem, AnnotationsDirectory, Code, TypeList, AnnotationSet, AnnotationSetRefList) to make sure they invoke alignment before writing each new section. Add an assertion in section-finalization paths comparing actualposition()to the expected aligned offset stored in TableOfContents.Changes
third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dex/io/DexDataBuffer.java(modified)tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/loader/SystemClassLoaderAdder.java(new)third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dex/Dex.java(modified)Testing
Note: this change was drafted with AI assistance and reviewed locally before submission.