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 and extend hasOverflowed

Browse Source
This commit is contained in:
Lanchon 2018-07-03 00:19:17 -03:00 committed by Ben Gruver
parent 2f29256bdf
commit fef5569d25
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
View File

@ -107,6 +107,8 @@ public abstract class DexWriter<
public static final int NO_INDEX = -1; public static final int NO_INDEX = -1;
public static final int NO_OFFSET = 0; public static final int NO_OFFSET = 0;
public static final int MAX_POOL_SIZE = (1 << 16);
protected final Opcodes opcodes; protected final Opcodes opcodes;
protected int stringIndexSectionOffset = NO_OFFSET; protected int stringIndexSectionOffset = NO_OFFSET;
@ -150,6 +152,8 @@ public abstract class DexWriter<
public final AnnotationSetSectionType annotationSetSection; public final AnnotationSetSectionType annotationSetSection;
public final EncodedArraySectionType encodedArraySection; public final EncodedArraySectionType encodedArraySection;
private final IndexSection<?>[] overflowableSections;
protected DexWriter(Opcodes opcodes) { protected DexWriter(Opcodes opcodes) {
this.opcodes = opcodes; this.opcodes = opcodes;
@ -166,6 +170,17 @@ public abstract class DexWriter<
this.annotationSection = sectionProvider.getAnnotationSection(); this.annotationSection = sectionProvider.getAnnotationSection();
this.annotationSetSection = sectionProvider.getAnnotationSetSection(); this.annotationSetSection = sectionProvider.getAnnotationSetSection();
this.encodedArraySection = sectionProvider.getEncodedArraySection(); this.encodedArraySection = sectionProvider.getEncodedArraySection();
overflowableSections = new IndexSection<?>[] {
//stringSection, // supports jumbo indexes
typeSection,
protoSection,
fieldSection,
methodSection,
//classSection, // redundant check: cannot be larger than typeSection
callSiteSection,
methodHandleSection,
};
} }
@Nonnull protected abstract SectionProvider getSectionProvider(); @Nonnull protected abstract SectionProvider getSectionProvider();
@ -250,19 +265,28 @@ public abstract class DexWriter<
} }
/** /**
* Checks whether any of the size-sensitive constant pools have overflowed. * Checks whether any of the size-sensitive constant pools have overflowed and have more than 64Ki entries.
*
* This checks whether the type, method, field pools are larger than 64k entries.
* *
* Note that even if this returns true, it may still be possible to successfully write the dex file, if the * Note that even if this returns true, it may still be possible to successfully write the dex file, if the
* overflowed items are not referenced anywhere that uses a 16-bit index * overflowed items are not referenced anywhere that uses a 16-bit index.
* *
* @return true if any of the size-sensitive constant pools have overflowed * @return true if any of the size-sensitive constant pools have overflowed
*/ */
public boolean hasOverflowed() { public boolean hasOverflowed() {
return methodSection.getItemCount() > (1 << 16) || return hasOverflowed(MAX_POOL_SIZE);
typeSection.getItemCount() > (1 << 16) || }
fieldSection.getItemCount() > (1 << 16);
/**
* Checks whether any of the size-sensitive constant pools have more than the supplied maximum number of entries.
*
* @param maxPoolSize the maximum number of entries allowed in any of the size-sensitive constant pools
* @return true if any of the size-sensitive constant pools have overflowed the supplied size limit
*/
public boolean hasOverflowed(int maxPoolSize) {
for (IndexSection section: overflowableSections) {
if (section.getItemCount() > maxPoolSize) return true;
}
return false;
} }
public void writeTo(@Nonnull DexDataStore dest) throws IOException { public void writeTo(@Nonnull DexDataStore dest) throws IOException {