fix: 修复解析 UTF-8 字符串错误

l0neman · Jun 25, 2022 · b97c5f3 · b97c5f3
1 parent 18ec734
commit b97c5f3
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/io.l0neman.axmlparser/StringPoolChunkParser.java b/src/io.l0neman.axmlparser/StringPoolChunkParser.java
@@ -48,26 +48,31 @@ private ResStringPoolRef[] parseStyleIndexArray(ObjectInput objectIO, ResStringP
     return styleIndexArray;
   }
 
+  private static int parseBytesLength(byte[] b) {
+    return b[1] & 0x7F;
+  }
+
   private static int parseStringLength(byte[] b) {
     return b[0] & 0x7F;
   }
 
   private String[] parseStringPool(ObjectInput objectInput, ResStringPoolHeader header, long stringPoolIndex)
-      throws IOException {
+          throws IOException {
     String[] stringPool = new String[header.stringCount];
 
     for (int i = 0; i < header.stringCount; i++) {
       final long index = stringPoolIndex + stringIndexArray[i].index;
-      final int parseStringLength = parseStringLength(objectInput.readBytes(index, Short.BYTES));
-      // 经过测试，发现 flags 为0 时，字符串每个字符间会间隔一个空白符，长度变为 2 倍。
-      final int stringLength = header.flags == 0 ? parseStringLength * 2 : parseStringLength;
 
       if (header.flags == 0) {
-        stringPool[i] = new String(objectInput.readBytes(index + Short.BYTES, stringLength), 0,
-                stringLength, StandardCharsets.UTF_16LE);
+        final int parseStringLength = parseStringLength(objectInput.readBytes(index, Short.BYTES));
+        final int bytesLength = parseStringLength * 2;
+
+        stringPool[i] = new String(objectInput.readBytes(index + Short.BYTES, bytesLength), 0,
+                bytesLength, StandardCharsets.UTF_16LE);
       } else {
-        stringPool[i] = new String(objectInput.readBytes(index + Short.BYTES, stringLength), 0,
-                stringLength, StandardCharsets.UTF_8);
+        final int parseBytesLength = parseBytesLength(objectInput.readBytes(index, Short.BYTES));
+        stringPool[i] = new String(objectInput.readBytes(index + Short.BYTES, parseBytesLength), 0,
+                parseBytesLength, StandardCharsets.UTF_8);
       }
     }