From eecdfae73fc5202253d6b9dea29968da7b3be941 Mon Sep 17 00:00:00 2001
From: CKCat <ckcatck@qq.com>
Date: Sun, 17 Mar 2024 02:57:10 +0800
Subject: [PATCH] fix(res): resolve some manifest decode errors (PR #2122)

* 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.
---
 .../main/java/jadx/core/xmlgen/BinaryXMLParser.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
index 3e0fcc7d7..c455f7b2a 100644
--- a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+++ b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
@@ -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 {