Protect any calls constructed by Rf_lang

Author: kevinushey

inst/include/Rcpp/Module.h

@@ -447,7 +447,9 @@ static VARIABLE_IS_NOT_USED SEXP moduleSym = NULL;
 #define GET_MODULE_SYM    ( moduleSym == NULL ? moduleSym = Rf_install("Module") : moduleSym )
 
 // this macro is called by code wanting to load a module -- see RInside's rinside_module_sample0.cpp
-#define LOAD_RCPP_MODULE(NAME) Rf_eval( Rf_lang2( GET_MODULE_SYM, _rcpp_module_boot_##NAME() ), R_GlobalEnv )
+#define LOAD_RCPP_MODULE(NAME) \
+    Shield<SEXP> __load_module_call__( Rf_lang2( GET_MODULE_SYM, _rcpp_module_boot_##NAME() ); \
+    Rf_eval(__load_module_call__), R_GlobalEnv );
 
 #endif
 

src/barrier.cpp

@@ -94,7 +94,8 @@ SEXP get_rcpp_cache() {
 
         SEXP getNamespaceSym = Rf_install("getNamespace"); // cannot be gc()'ed  once in symbol table
         Rcpp::Shield<SEXP> RcppString( Rf_mkString("Rcpp") );
-        Rcpp::Shield<SEXP> RCPP( Rf_eval(Rf_lang2( getNamespaceSym, RcppString ), R_GlobalEnv) ) ;
+        Rcpp::Shield<SEXP> call( Rf_lang2( getNamespaceSym, RcppString ) );
+        Rcpp::Shield<SEXP> RCPP( Rf_eval(call, R_GlobalEnv) ) ;
 
         Rcpp_cache = Rf_findVarInFrame( RCPP, Rf_install(".rcpp_cache") ) ;
         Rcpp_cache_know = true ;