jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(res): chunk parsing was aborted too early for unordered entries (PR #2444)

Browse Source
This commit is contained in:
Jan S.
2025-03-14 16:48:37 +01:00
committed by GitHub
parent 3209dbb7a4
commit 6eeb303d73
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/ResTableBinaryParser.java
+13 -13
View File
@@ -275,33 +275,33 @@ public class ResTableBinaryParser extends CommonBinaryParser implements IResTabl
}
}
is.skipToPos(entriesStart, "Failed to skip to entries start");
int ignoredEoc = 0; // ignored entries because they are located after end of chunk
for (EntryOffset entryOffset : offsets) {
int offset = entryOffset.getOffset();
if (offset == NO_ENTRY) {
continue;
}
int index = entryOffset.getIdx();
if (is.getPos() >= chunkEnd) {
// Certain resource obfuscated apps like com.facebook.orca have more entries defined
// than actually fit into the chunk size -> ignore the remaining entries
LOG.warn("End of chunk reached - ignoring remaining {} entries in type: {}", entryCount - index, typeName);
break;
}
long entryStartOffset = entriesStart + offset;
if (entryStartOffset >= chunkEnd) {
// Certain resource obfuscated apps like com.facebook.orca have more entries defined
// than actually fit into the chunk size -> ignore this entry
ignoredEoc++;
// LOG.debug("Pos is after chunk end: {} end {}", entryStartOffset, chunkEnd);
continue;
}
if (entryStartOffset < is.getPos()) {
// workaround for issue #2343: if the entryStartOffset is located before our current position
is.reset();
}
int index = entryOffset.getIdx();
is.skipToPos(entryStartOffset, "Expected start of entry " + index);
parseEntry(pkg, id, index, config.getQualifiers());
}
if (chunkEnd > is.getPos()) {
// Skip remaining unknown data in this chunk (e.g. type 8 entries")
long skipSize = chunkEnd - is.getPos();
LOG.debug("Unknown data at the end of type chunk encountered, skipping {} bytes and continuing at offset {}", skipSize,
chunkEnd);
is.skip(skipSize);
if (ignoredEoc > 0) {
// invalid = data offset is after the chunk end
LOG.warn("{} entries of type {} has been ignored (invalid offset)", ignoredEoc, typeName);
}
is.skipToPos(chunkEnd, "End of chunk");
}
private static class EntryOffset {