From 4a1f976032d485a9bc1404132bfd0c17c04a413e Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Sat, 19 Dec 2020 06:19:06 +0700
Subject: [PATCH] [Java Runtime Sandbox] make it non-overrideable

---
 app/src/main/java/net/kdt/pojavlaunch/Tools.java          | 3 ---
 app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
index 1e70b8c1f..99b49096c 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -78,9 +78,6 @@ public final class Tools
     public static void getJavaArgs(Context ctx, List<String> javaArgList) {
         List<String> overrideableArgList = new ArrayList<String>();
 
-        overrideableArgList.add("-Djava.security.manager");
-        overrideableArgList.add("-Djava.security.policy==java_sandbox.policy");
-        
         overrideableArgList.add("-Djava.home=" + Tools.DIR_HOME_JRE);
         overrideableArgList.add("-Djava.io.tmpdir=" + ctx.getCacheDir().getAbsolutePath());
         
diff --git a/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
index 6bf2740a4..2575a1f39 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -248,6 +248,11 @@ public class JREUtils
         List<String> javaArgList = new ArrayList<String>();
         javaArgList.add(Tools.DIR_HOME_JRE + "/bin/java");
         Tools.getJavaArgs(ctx, javaArgList);
+
+        // Run java on sandbox, non-overrideable.
+        javaArgList.add("-Djava.security.manager");
+        javaArgList.add("-Djava.security.policy==java_sandbox.policy");
+        
         javaArgList.addAll(args);
         
         // For debugging only!