Catch SecurityException when reading system property in BitEncoding

This does not fix KT-15167 though because the exception from KT-20575 is thrown shortly afterwards #KT-15167
2018-01-05 17:49:58 +01:00
parent 42de05f3fa
commit 25ee67a644
1 changed files with 13 additions and 1 deletions
@@ -13,7 +13,19 @@ import java.util.List;
 import static org.jetbrains.kotlin.metadata.jvm.deserialization.UtfEncodingKt.MAX_UTF8_INFO_LENGTH;

 public class BitEncoding {
-    private static final boolean FORCE_8TO7_ENCODING = "true".equals(System.getProperty("kotlin.jvm.serialization.use8to7"));
+    private static final boolean FORCE_8TO7_ENCODING;
+
+    static {
+        String use8to7;
+        try {
+            use8to7 = System.getProperty("kotlin.jvm.serialization.use8to7");
+        }
+        catch (SecurityException e) {
+            use8to7 = null;
+        }
+
+        FORCE_8TO7_ENCODING = "true".equals(use8to7);
+    }

    private static final char _8TO7_MODE_MARKER = (char) -1;