Avoid creating objects in .GlobalEnv

NEWS.md

@@ -1,6 +1,9 @@
 
 # development version
 
+* `r_session` now avoids creating `data` and `env` objects in the global
+  environment of the subprocess.
+
 # callr 3.3.0
 
 * callr now sets the `.Last.error` variable for every uncaught callr

R/hook.R

@@ -8,6 +8,7 @@ common_hook <- function() {
     data <- env$`__callr_data__`
     data$pxlib <- data$load_client_lib(data$sofile)
     options(error = function() invokeRestart("abort"))
+    rm(list = c("data", "env"))
   }, list("__envfile__" = env_file))
 }
 
@@ -25,6 +26,7 @@ session_load_hook <- function(user_hook = NULL) {
   ehook <- substitute({
     data <- as.environment("tools:callr")$`__callr_data__`
     data$pxlib$disable_fd_inheritance()
+    rm(data)
   })
 
   hook <- substitute({ c; e }, list(c = chook, e = ehook))

R/r-session.R

@@ -521,25 +521,33 @@ rs__status_expr <- function(code, text = "", fd = 3L) {
 
 rs__prehook <- function(stdout, stderr) {
   oexpr <- if (!is.null(stdout)) substitute({
-    env <- as.environment("tools:callr")$`__callr_data__`
-    env$.__stdout__ <- env$pxlib$set_stdout_file(`__fn__`)
+    assign(
+      ".__stdout__",
+      as.environment("tools:callr")$`__callr_data__`$pxlib$
+                                   set_stdout_file(`__fn__`),
+      envir = as.environment("tools:callr")$`__callr_data__`)
   }, list(`__fn__` = stdout))
   eexpr <- if (!is.null(stderr)) substitute({
-    env <- as.environment("tools:callr")$`__callr_data__`
-    env$.__stderr__ <- env$pxlib$set_stderr_file(`__fn__`)
+    assign(
+      ".__stderr__",
+      as.environment("tools:callr")$`__callr_data__`$pxlib$
+                                   set_stderr_file(`__fn__`),
+      envir = as.environment("tools:callr")$`__callr_data__`)
   }, list(`__fn__` = stderr))
 
   substitute({ o; e }, list(o = oexpr, e = eexpr))
 }
 
 rs__posthook <- function(stdout, stderr) {
   oexpr <- if (!is.null(stdout)) substitute({
-    env <- as.environment("tools:callr")$`__callr_data__`
-    env$pxlib$set_stdout(env$.__stdout__)
+    as.environment("tools:callr")$`__callr_data__`$
+      pxlib$set_stdout(as.environment("tools:callr")$`__callr_data__`$
+      .__stdout__)
   })
   eexpr <- if (!is.null(stderr)) substitute({
-    env <- as.environment("tools:callr")$`__callr_data__`
-    env$pxlib$set_stderr(env$.__stderr__)
+    as.environment("tools:callr")$`__callr_data__`$
+      pxlib$set_stderr(as.environment("tools:callr")$`__callr_data__`$
+      .__stderr__)
   })
 
   substitute({ o; e }, list(o = oexpr, e = eexpr))

tests/testthat/test-r-session.R

@@ -7,6 +7,9 @@ test_that("regular use", {
 
   expect_equal(rs$get_state(), "idle")
 
+  ## Clean session
+  expect_identical(rs$run(function() ls(.GlobalEnv)), character())
+
   ## Start a command
   rs$call(function() 42)