ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-29 12:20:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a deodex issue when merging an unresolved array type

Browse Source
This commit is contained in:
Ben Gruver 2012-10-04 20:38:18 -07:00
parent 60bb8c675c
commit 598dcde6c9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
View File

@ -402,7 +402,13 @@ public class ClassPath {
//if the two arrays have the same number of dimensions, then we should return an array class with the //if the two arrays have the same number of dimensions, then we should return an array class with the
//same number of dimensions, for the common superclass of the 2 element classes //same number of dimensions, for the common superclass of the 2 element classes
if (class1.arrayDimensions == class2.arrayDimensions) { if (class1.arrayDimensions == class2.arrayDimensions) {
ClassDef commonElementClass = getCommonSuperclass(class1.elementClass, class2.elementClass); ClassDef commonElementClass;
if (class1.elementClass instanceof UnresolvedClassDef ||
class2.elementClass instanceof UnresolvedClassDef) {
commonElementClass = ClassPath.getUnresolvedObjectClassDef();
} else {
commonElementClass = getCommonSuperclass(class1.elementClass, class2.elementClass);
}
return getArrayClassDefByElementClassAndDimension(commonElementClass, class1.arrayDimensions); return getArrayClassDefByElementClassAndDimension(commonElementClass, class1.arrayDimensions);
} }