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

fix(xml): handle incorrect android manifest namespace chunks (#1232) (PR #1243)

Browse Source 
* allow for handling of incorrect android manifest namespace chunks
* Update BinaryXMLParser.java
This commit is contained in:
green9317
2021-08-27 07:40:08 -07:00
committed by GitHub
parent a62de839be
commit 8d5f22e43d
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+21 -6
View File
@@ -147,16 +147,24 @@ public class BinaryXMLParser extends CommonBinaryParser {
}
private void parseNameSpace() throws IOException {
if (is.readInt16() != 0x10) {
die("NAMESPACE header is not 0x0010");
int headerSize = is.readInt16();
if (headerSize > 0x10) {
LOG.warn("Invalid namespace header");
} else if (headerSize < 0x10) {
die("NAMESPACE header is not 0x10 big");
}
if (is.readInt32() != 0x18) {
int size = is.readInt32();
if (size > 0x18) {
LOG.warn("Invalid namespace size");
} else if (size < 0x18) {
die("NAMESPACE header chunk is not 0x18 big");
}
int beginLineNumber = is.readInt32();
int comment = is.readInt32();
int beginPrefix = is.readInt32();
int beginURI = is.readInt32();
is.skip(headerSize - 0x10);
String nsKey = getString(beginURI);
String nsValue = getString(beginPrefix);
@@ -167,16 +175,23 @@ public class BinaryXMLParser extends CommonBinaryParser {
}
private void parseNameSpaceEnd() throws IOException {
if (is.readInt16() != 0x10) {
die("NAMESPACE header is not 0x0010");
int headerSize = is.readInt16();
if (headerSize > 0x10) {
LOG.warn("Invalid namespace end");
} else if (headerSize < 0x10) {
die("NAMESPACE end is not 0x10 big");
}
if (is.readInt32() != 0x18) {
int dataSize = is.readInt32();
if (dataSize > 0x18) {
LOG.warn("Invalid namespace size");
} else if (dataSize < 0x18) {
die("NAMESPACE header chunk is not 0x18 big");
}
int endLineNumber = is.readInt32();
int comment = is.readInt32();
int endPrefix = is.readInt32();
int endURI = is.readInt32();
is.skip(headerSize - 0x10);
namespaceDepth--;
String nsKey = getString(endURI);