Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #3961 #3962

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Fixes #3961 #3962

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e903a
fixes #3961
VishnuSanal Oct 21, 2023
f188223
remove `@Nullable`
VishnuSanal Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions ...press_7z/src/main/java/com/amaze/filemanager/filesystem/compressed/sevenz/SevenZFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down