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

fix(res): resolve some manifest decode errors (PR #2122)

Browse Source 
* The elementSize may be larger than the actual size of the element chunk.

* end namespace chunk size can be any value.

* keep at least a warning.
This commit is contained in:
CKCat
2024-03-17 02:57:10 +08:00
committed by GitHub
parent 8760b4ddde
commit eecdfae73f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+8 -5
View File
@@ -193,10 +193,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
die("NAMESPACE end is not 0x10 big");
}
int dataSize = is.readInt32();
if (dataSize > 0x18) {
LOG.warn("Invalid namespace size");
} else if (dataSize < 0x18) {
die("NAMESPACE header chunk is not 0x18 big");
if (dataSize != 0x18) {
LOG.warn("Invalid namespace end size");
}
int endLineNumber = is.readInt32();
int comment = is.readInt32();
@@ -246,7 +244,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
die("ELEMENT HEADER SIZE is not 0x10");
}
// TODO: Check element chunk size
is.readInt32();
long startPos = is.getPos();
int elementSize = is.readInt32();
int elementBegLineNumber = is.readInt32();
int comment = is.readInt32();
int startNS = is.readInt32();
@@ -291,6 +290,10 @@ public class BinaryXMLParser extends CommonBinaryParser {
for (int i = 0; i < attributeCount; i++) {
parseAttribute(i, attrNewLine, attrCache);
}
long endPos = is.getPos();
if (endPos - startPos + 0x4 < elementSize) {
is.skip(elementSize - (endPos - startPos + 0x4));
}
}
private void parseAttribute(int i, boolean newLine, Set<String> attrCache) throws IOException {