Merge pull request #3962 from TeamAmaze/issue/3961

Fixes #3961
TeamAmaze · Oct 30, 2023 · 4161845 · 4161845
2 parents 0beaea2 + f188223
commit 4161845
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/...press_7z/src/main/java/com/amaze/filemanager/filesystem/compressed/sevenz/SevenZFile.java b/...press_7z/src/main/java/com/amaze/filemanager/filesystem/compressed/sevenz/SevenZFile.java
@@ -35,7 +35,8 @@
 import java.nio.CharBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
+import java.nio.charset.CoderMalfunctionError;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
@@ -2121,13 +2122,22 @@ private static byte[] utf16Decode(final char[] chars) {
     if (chars == null) {
       return null;
     }
-    final ByteBuffer encoded = Charset.forName("UTF-16LE").encode(CharBuffer.wrap(chars));
-    if (encoded.hasArray()) {
-      return encoded.array();
+
+    try {
+      final ByteBuffer encoded = StandardCharsets.UTF_16LE.encode(CharBuffer.wrap(chars));
+
+      if (encoded.hasArray()) {
+        return encoded.array();
+      }
+      final byte[] e = new byte[encoded.remaining()];
+      encoded.get(e);
+
+      return e;
+
+    } catch (CoderMalfunctionError e) {
+      e.printStackTrace();
+      return null;
     }
-    final byte[] e = new byte[encoded.remaining()];
-    encoded.get(e);
-    return e;
   }
 
   private static int assertFitsIntoNonNegativeInt(final String what, final long value)