Merge pull request #1010 from romainfrancois/fix/namespace_env

protect call inside Rcpp::Environment<>::namespace_env()

Author: eddelbuettel

inst/include/Rcpp/DataFrame.h

@@ -101,7 +101,7 @@ namespace Rcpp{
             if( ::Rf_inherits( x, "data.frame" )){
                 Parent::set__( x ) ;
             } else{
-                SEXP y = internal::convert_using_rfunction( x, "as.data.frame" ) ;
+                Shield<SEXP> y(internal::convert_using_rfunction( x, "as.data.frame" )) ;
                 Parent::set__( y ) ;
             }
         }
@@ -130,7 +130,7 @@ namespace Rcpp{
             obj.erase(strings_as_factors_index) ;
             names.erase(strings_as_factors_index) ;
             obj.attr( "names") = names ;
-            Shield<SEXP> call( Rf_lang3(as_df_symb, obj, wrap( strings_as_factors ) ) ) ;
+            Shield<SEXP> call( Rf_lang3(as_df_symb, obj, Rf_ScalarLogical(strings_as_factors) ) ) ;
             SET_TAG( CDDR(call),  strings_as_factors_symb ) ;
             Shield<SEXP> res(Rcpp_fast_eval(call, R_GlobalEnv));
             DataFrame_Impl out( res ) ;

inst/include/Rcpp/Environment.h

@@ -374,7 +374,8 @@ namespace Rcpp{
             try{
                 SEXP getNamespaceSym = Rf_install("getNamespace");
                 Shield<SEXP> package_str( Rf_mkString(package.c_str()) );
-                env = Rcpp_fast_eval(Rf_lang2(getNamespaceSym, package_str), R_GlobalEnv);
+                Shield<SEXP> call( Rf_lang2(getNamespaceSym, package_str) );
+                env = Rcpp_fast_eval(call, R_GlobalEnv);
             } catch( ... ){
                 throw no_such_namespace( package  ) ;
             }

inst/include/Rcpp/r_cast.h

@@ -31,7 +31,8 @@ namespace Rcpp {
             Armor<SEXP> res;
             try{
                 SEXP funSym = Rf_install(fun);
-                res = Rcpp_fast_eval(Rf_lang2(funSym, x), R_GlobalEnv);
+                Shield<SEXP> call(Rf_lang2(funSym, x));
+                res = Rcpp_fast_eval(call, R_GlobalEnv);
             } catch( eval_error& e) {
                 const char* fmt = "Could not convert using R function: %s.";
                 throw not_compatible(fmt, fun);