R_UnwindProtect eval

Author: shikokuchuo

src/aio.c

@@ -252,12 +252,17 @@ static void request_complete_signal(void *arg) {
 
 }
 
+static void release_object(void *data, Rboolean jump) {
+  if (jump)
+    R_ReleaseObject((SEXP) data);
+}
+
 static void raio_invoke_cb(void *arg) {
-  SEXP callExpr;
-  PROTECT(callExpr = Rf_lcons((SEXP) arg, R_NilValue));
-  (void) Rf_eval(callExpr, R_GlobalEnv);
+  SEXP call, data = (SEXP) arg;
+  PROTECT(call = Rf_lcons(data, R_NilValue));
+  (void) R_UnwindProtect(eval_safe, call, release_object, data, NULL);
   UNPROTECT(1);
-  R_ReleaseObject(arg);
+  R_ReleaseObject(data);
 }
 
 static void raio_complete_cb(void *arg) {

src/core.c

@@ -42,7 +42,7 @@ SEXP mk_error(const int xc) {
 
 }
 
-static SEXP eval_safe (void *call) {
+SEXP eval_safe (void *call) {
   return Rf_eval((SEXP) call, R_GlobalEnv);
 }
 

src/nanonext.h

@@ -192,6 +192,7 @@ typedef struct nano_buf_s {
 
 SEXP mk_error(const int);
 SEXP mk_error_ncurl(const int);
+SEXP eval_safe(void *);
 nano_buf nano_char_buf(const SEXP);
 SEXP nano_decode(unsigned char *, const size_t, const int);
 void nano_encode(nano_buf *, const SEXP);