Run read_console() within safely!

Author: lionel-

crates/ark/src/interface.rs

@@ -53,6 +53,7 @@ use harp::lock::R_RUNTIME_LOCK;
 use harp::lock::R_RUNTIME_LOCK_COUNT;
 use harp::object::RObject;
 use harp::r_lock;
+use harp::r_safely;
 use harp::r_symbol;
 use harp::routines::r_register_routines;
 use harp::session::r_poke_option_show_error_messages;
@@ -1064,7 +1065,7 @@ extern "C" fn r_read_console(
     hist: c_int,
 ) -> i32 {
     let main = unsafe { R_MAIN.as_mut().unwrap() };
-    let (out, interrupt) = main.read_console(prompt, buf, buflen, hist);
+    let (out, interrupt) = r_safely!(main.read_console(prompt, buf, buflen, hist));
 
     // NOTE: Keep this function a "Plain Old Frame" without any
     // destructors. We're longjumping from here in case of interrupt.

crates/harp/src/exec.rs

@@ -430,6 +430,8 @@ where
     F: 'env,
     T: 'env,
 {
+    // NOTE: Keep this function a Plain Old Frame without Drop destructors
+
     let polled_events = unsafe { R_PolledEvents };
     let interrupts_suspended = unsafe { R_interrupts_suspended };
     unsafe {

crates/harp/src/session.rs

@@ -32,16 +32,16 @@ static mut OPTIONS_FN: Option<SEXP> = None;
 pub fn r_n_frame() -> crate::error::Result<i32> {
     SESSION_INIT.call_once(init_interface);
 
-    r_safely! {
+    unsafe {
         let ffi = r_try_eval_silent(NFRAME_CALL.unwrap_unchecked(), R_BaseEnv)?;
         let n_frame = IntegerVector::new(ffi)?;
         Ok(n_frame.get_unchecked_elt(0))
     }
 }
 
 pub fn r_sys_frame(n: c_int) -> crate::error::Result<SEXP> {
-    let mut protect = unsafe { RProtect::new() };
-    r_safely! {
+    unsafe {
+        let mut protect = RProtect::new();
         let n = protect.add(Rf_ScalarInteger(n));
         let call = protect.add(r_lang!(r_symbol!("sys.frame"), n));
         Ok(r_try_eval_silent(call, R_BaseEnv)?)