iBotPeaches/Apktool
1
0 Fork 0
mirror of https://github.com/iBotPeaches/Apktool.git synced 2026-11-07 10:16:04 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: improve xml serializer checks (#4251)

Browse Source
This commit is contained in:
Igor Eisberg authored and GitHub committed 2026-10-13 08:50:27 -04:00
1 parent 40787e58b0
commit c3ab7e3b2c
2 files changed
+32 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlSerializer.java
+32 -14
View File
@@ -127,20 +127,35 @@ public class ResXmlSerializer implements XmlSerializer {
namespace = "";
}
// Ignore identical prefix definitions.
if (prefix.equals(getPrefix(namespace, true, false))) {
// Skip declarations that aapt2 rejects:
// 1. A non-empty prefix bound to an empty URI (only the default namespace may be undeclared).
// 2. The reserved prefixes "xml" and "xmlns".
// 3. The reserved URIs for "xml" and "xmlns", bound to any prefix.
if ((!prefix.isEmpty() && namespace.isEmpty())
|| prefix.equals(XmlUtils.XML_PREFIX) || prefix.equals(XmlUtils.XMLNS_PREFIX)
|| namespace.equals(XmlUtils.XML_URI) || namespace.equals(XmlUtils.XMLNS_URI)) {
return;
}
int i = (mNamespaceCounts[mDepth + 1]++) << 1;
if (mNamespaceStack.length < i + 1) {
// Skip declaration if the prefix is already bound to this URI.
for (int i = mNamespaceCounts[mDepth + 1] * 2 - 2; i >= 0; i -= 2) {
if (mNamespaceStack[i].equals(prefix)) {
if (mNamespaceStack[i + 1].equals(namespace)) {
return;
}
break;
}
}
int i = (mNamespaceCounts[mDepth + 1]++) * 2;
if (mNamespaceStack.length <= i + 1) {
String[] newStack = new String[mNamespaceStack.length + 16];
System.arraycopy(mNamespaceStack, 0, newStack, 0, i);
mNamespaceStack = newStack;
}
mNamespaceStack[i++] = prefix;
mNamespaceStack[i] = namespace;
mNamespaceStack[i] = prefix;
mNamespaceStack[i + 1] = namespace;
}
@Override
@@ -157,7 +172,7 @@ public class ResXmlSerializer implements XmlSerializer {
for (int i = mNamespaceCounts[mDepth + 1] * 2 - 2; i >= 0; i -= 2) {
if (mNamespaceStack[i + 1].equals(namespace) && (includeDefault || !mNamespaceStack[i].isEmpty())) {
String candidate = mNamespaceStack[i];
for (int j = i + 2; j < mNamespaceCounts[mDepth + 1] * 2; j++) {
for (int j = i + 2; j < mNamespaceCounts[mDepth + 1] * 2; j += 2) {
if (mNamespaceStack[j].equals(candidate)) {
candidate = null;
break;
@@ -174,7 +189,7 @@ public class ResXmlSerializer implements XmlSerializer {
}
String prefix;
if (namespace.isEmpty()) {
if (namespace != null && namespace.isEmpty()) {
prefix = "";
} else {
do {
@@ -219,7 +234,7 @@ public class ResXmlSerializer implements XmlSerializer {
writeIndent();
int i = mDepth * 3;
if (mElementStack.length < i + 3) {
if (mElementStack.length <= i + 2) {
String[] newStack = new String[mElementStack.length + 12];
System.arraycopy(mElementStack, 0, newStack, 0, i);
mElementStack = newStack;
@@ -234,9 +249,9 @@ public class ResXmlSerializer implements XmlSerializer {
}
}
mElementStack[i++] = namespace;
mElementStack[i++] = prefix;
mElementStack[i] = name;
mElementStack[i] = namespace;
mElementStack[i + 1] = prefix;
mElementStack[i + 2] = name;
write('<');
if (!prefix.isEmpty()) {
@@ -389,8 +404,11 @@ public class ResXmlSerializer implements XmlSerializer {
if (!prefix.isEmpty()) {
write(':');
write(prefix);
} else if (getNamespace().isEmpty() && !uri.isEmpty()) {
throw new IllegalStateException("Could not set default namespace for elements in no namespace.");
} else {
String namespace = getNamespace();
if (namespace != null && namespace.isEmpty() && !uri.isEmpty()) {
throw new IllegalStateException("Could not set default namespace for elements in no namespace.");
}
}
write("=\"");
if (mAutoEscape) {
brut.j.xml/src/main/java/brut/xml/XmlUtils.java
-1
View File
@@ -47,7 +47,6 @@ import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Objects;