From 02065094caad30315c862ece00351ddba8795f1c Mon Sep 17 00:00:00 2001 From: Glavo Date: Thu, 22 Feb 2024 23:20:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8=20Java=201?= =?UTF-8?q?9+=20=E5=90=AF=E5=8A=A8=E6=B8=B8=E6=88=8F=E6=97=B6=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E4=B9=B1=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#2846)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/launch/DefaultLauncher.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index 0c692f355..3048997a9 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -150,8 +150,14 @@ public class DefaultLauncher extends Launcher { LOG.log(Level.WARNING, "Bad file encoding", ex); } } - res.addDefault("-Dsun.stdout.encoding=", encoding.name()); - res.addDefault("-Dsun.stderr.encoding=", encoding.name()); + + if (options.getJava().getParsedVersion() < 19) { + res.addDefault("-Dsun.stdout.encoding=", encoding.name()); + res.addDefault("-Dsun.stderr.encoding=", encoding.name()); + } else { + res.addDefault("-Dstdout.encoding=", encoding.name()); + res.addDefault("-Dstderr.encoding=", encoding.name()); + } // Fix RCE vulnerability of log4j2 res.addDefault("-Djava.rmi.server.useCodebaseOnly=", "true");