Skip to content

Commit 6c0f8f7

Browse files
committed
Fix: disallow host access in the launcher when --jvm is not passed
1 parent a649262 commit 6c0f8f7

File tree

1 file changed

+6
-6
lines changed
  • com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher

1 file changed

+6
-6
lines changed

com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,26 +171,26 @@ protected void validateArguments(Map<String, String> polyglotOptions) {
171171
}
172172

173173
@Override
174-
protected void launch(Builder contextBuilder) {
174+
protected void launch(Builder contextBuilderIn) {
175175
StartupTiming.timestamp("RMain.launch");
176176
assert client != null;
177177
if (rArguments == null) {
178178
// validateArguments did not set the value
179179
return;
180180
}
181181
this.consoleHandler = ConsoleHandler.createConsoleHandler(options, null, inStream, outStream);
182-
Builder contextBuilderAllowAll = contextBuilder.allowAllAccess(true);
183-
if (ignoreJvmArguments) {
184-
contextBuilderAllowAll = contextBuilderAllowAll.allowHostAccess(useJVM);
182+
Builder contextBuilder = contextBuilderIn;
183+
if (!ignoreJvmArguments) {
184+
contextBuilder = contextBuilder.allowHostAccess(useJVM);
185185
}
186186

187187
Context context;
188188
String tracedLibs = System.getenv("DEBUG_LLVM_LIBS");
189189
if (tracedLibs != null) {
190-
context = preparedContext = contextBuilderAllowAll.allowExperimentalOptions(true).option("inspect", "true").option("llvm.enableLVI", "true").option("llvm.llDebug", "true").arguments("R", rArguments).in(
190+
context = preparedContext = contextBuilder.option("inspect", "true").option("llvm.enableLVI", "true").option("llvm.llDebug", "true").arguments("R", rArguments).in(
191191
consoleHandler.createInputStream()).out(outStream).err(errStream).build();
192192
} else {
193-
context = preparedContext = contextBuilderAllowAll.arguments("R", rArguments).in(consoleHandler.createInputStream()).out(outStream).err(errStream).build();
193+
context = preparedContext = contextBuilder.arguments("R", rArguments).in(consoleHandler.createInputStream()).out(outStream).err(errStream).build();
194194
}
195195

196196
this.consoleHandler.setContext(context);

0 commit comments

Comments
 (0)