fix: support encode styled string if length larger than offset (#3254)

iBotPeaches · Aug 7, 2023 · 22d792e · 22d792e
1 parent 50226e5
commit 22d792e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StyledString.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StyledString.java
@@ -157,8 +157,11 @@ private void decodeIterate(PeekingIterator<Span> it) {
             }
 
             // write encoded raw text preceding the closing tag
-            if (spanEnd > lastOffset) {
+            if (spanEnd > lastOffset && text.length() >= spanEnd) {
                 xmlValue.append(ResXmlEncoders.escapeXmlChars(text.substring(lastOffset, spanEnd)));
+            } else if (text.length() >= lastOffset && text.length() < spanEnd) {
+                LOGGER.warning("Span (" + name + ") exceeds text length " + text.length());
+                xmlValue.append(ResXmlEncoders.escapeXmlChars(text.substring(lastOffset)));
             }
             lastOffset = spanEnd;