fix: tighten span tag parsing (#4061)

Author: IgorEisberg

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/data/StyledString.java

@@ -21,9 +21,11 @@
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 public class StyledString implements CharSequence {
     private static final Logger LOGGER = Logger.getLogger(StyledString.class.getName());
@@ -100,9 +102,10 @@ private void decodeIterate(PeekingIterator<Span> it) {
         mBuffer.append('<').append(name);
         if (attributes != null) {
             for (Map.Entry<String, String> entry : attributes.entrySet()) {
-                mBuffer.append(' ').append(entry.getKey()).append("=\"")
-                       .append(ResXmlEncoders.escapeXmlChars(entry.getValue()))
-                       .append('"');
+                mBuffer.append(' ')
+                    .append(entry.getKey()).append("=\"")
+                    .append(ResXmlEncoders.escapeXmlChars(entry.getValue()))
+                    .append('"');
             }
         }
         // If an opening tag is followed by a matching closing tag, write as an empty-element tag.
@@ -132,8 +135,9 @@ private void decodeIterate(PeekingIterator<Span> it) {
     }
 
     public static class Span {
-        private static final Splitter.MapSplitter ATTRIBUTES_SPLITTER =
-            Splitter.on(';').omitEmptyStrings().withKeyValueSeparator(Splitter.on('=').limit(2));
+        private static final Splitter.MapSplitter ATTR_SPLITTER = Splitter.on(
+            Pattern.compile(";(?=[\\p{L}_][\\p{L}\\p{N}_.-]*=)"))
+                .withKeyValueSeparator(Splitter.on('=').limit(2));
 
         private final String mTag;
         private final int mFirstChar;
@@ -159,14 +163,12 @@ public int getLastChar() {
 
         public String getName() {
             int separatorIdx = mTag.indexOf(';');
-            return separatorIdx == -1 ? mTag : mTag.substring(0, separatorIdx);
+            return separatorIdx != -1 ? mTag.substring(0, separatorIdx) : mTag;
         }
 
         public Map<String, String> getAttributes() {
             int separatorIdx = mTag.indexOf(';');
-            return separatorIdx != -1 ? ATTRIBUTES_SPLITTER.split(
-                mTag.substring(separatorIdx + 1, mTag.endsWith(";") ? mTag.length() - 1 : mTag.length())
-            ) : null;
+            return separatorIdx != -1 ? ATTR_SPLITTER.split(mTag.substring(separatorIdx + 1)) : null;
         }
     }
 }

brut.apktool/apktool-lib/src/test/resources/testapp/res/values-mcc001/strings.xml

@@ -6,15 +6,17 @@
     <string name="test_string3">\@</string>
     <string name="test_string4">\?</string>
     <string name="test_string5">\#ff123456</string>
-    <string name="test_string7">&amp;</string>
-    <string name="test_string8">"'"</string>
-    <string name="test_string9">\"</string>
-    <string name="test_string10">\u0005</string>
-    <string name="test_string11">" foo  bar   "</string>
-    <string name="test_string12">"foo
+    <string name="test_string6">&amp;</string>
+    <string name="test_string7">"'"</string>
+    <string name="test_string8">\"</string>
+    <string name="test_string9">\u0005</string>
+    <string name="test_string10">" foo  bar   "</string>
+    <string name="test_string11">"foo
 bar"</string>
-    <string name="test_string13">" foo"<b>bar <i> baz </i></b> <u>foo</u></string>
-    <string name="test_string14">foo<sometag someattr1="someval1" someattr2="someval2">bar</sometag>baz</string>
+    <string name="test_string12">" foo"<b>bar <i> baz </i></b> <u>foo</u></string>
+    <string name="test_string13">foo<sometag someattr1="someval1" someattr2="someval2">bar</sometag>baz</string>
+    <string name="test_string14">foo<span style="font-family:serif;font-size: 12px;">bar</span>baz</string>
+    <string name="test_string15">foo<span href="https://test.com/1234#param=val" style="font-family: serif; font-size:12px;">bar</span>baz</string>
     <string name="test_string16">foo<b>bar<i>"b
         az"</i></b>foo</string>
     <string name="test_string17" formatted="false">%d of %d</string>