Merge pull request #784 from RcppCore/bugfix/proxy-sexp-protection

protect the temporary SEXPs produced by wrap

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,12 @@
+2017-12-04  Kevin Ushey  <[email protected]>
+
+        * inst/include/Rcpp/RObject.h: Protect temporary wrapped SEXPs
+        * inst/include/Rcpp/api/meat/DataFrame.h: Idem
+        * inst/include/Rcpp/api/meat/Environment.h: Idem
+        * inst/include/Rcpp/api/meat/proxy.h: Idem
+        * inst/include/Rcpp/proxy/ProtectedProxy.h: Idem
+        * inst/include/Rcpp/vector/generic_proxy.h: Idem
+
 2017-12-03  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Version, Date): New minor version

inst/include/Rcpp/Environment.h

@@ -215,6 +215,10 @@ namespace Rcpp{
             return true ;
         }
 
+        bool assign(const std::string& name, const Shield<SEXP>& x) const {
+            return assign(name, (SEXP) x);
+        }
+
         /**
          * wrap and assign. If there is a wrap method taking an object
          * of WRAPPABLE type, then it is wrapped and the corresponding SEXP

inst/include/Rcpp/RObject.h

@@ -48,7 +48,7 @@ namespace Rcpp{
          */
         template <typename T>
         RObject_Impl& operator=(const T& other) {
-            Storage::set__( wrap(other) ) ;
+            Storage::set__(Shield<SEXP>(wrap(other)));
             return *this;
         }
 

inst/include/Rcpp/api/meat/DataFrame.h

@@ -23,7 +23,7 @@ namespace Rcpp{
      template <template <class> class StoragePolicy>
      template <class T>
      DataFrame_Impl<StoragePolicy>::DataFrame_Impl( const T& obj){
-        set__( wrap(obj) ) ;
+        set__(Shield<SEXP>(wrap(obj)));
      }
 
 }

inst/include/Rcpp/api/meat/Environment.h

@@ -27,7 +27,7 @@ namespace Rcpp{
 template <template <class> class StoragePolicy>
 template <typename WRAPPABLE>
 bool Environment_Impl<StoragePolicy>::assign( const std::string& name, const WRAPPABLE& x) const {
-    return assign( name, wrap( x ) ) ;
+    return assign(name, Shield<SEXP>(wrap(x)));
 }
 
 template <template <class> class StoragePolicy>

inst/include/Rcpp/api/meat/proxy.h

@@ -30,7 +30,7 @@ template <typename CLASS>
 template <typename T>
 typename AttributeProxyPolicy<CLASS>::AttributeProxy&
 AttributeProxyPolicy<CLASS>::AttributeProxy::operator=(const T& rhs) {
-    set( wrap(rhs) );
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 
@@ -61,7 +61,7 @@ template <typename CLASS>
 template <typename T>
 typename NamesProxyPolicy<CLASS>::NamesProxy&
 NamesProxyPolicy<CLASS>::NamesProxy::operator=(const T& rhs) {
-    set( wrap(rhs) );
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 
@@ -82,7 +82,7 @@ template <typename CLASS>
 template <typename T>
 typename SlotProxyPolicy<CLASS>::SlotProxy&
 SlotProxyPolicy<CLASS>::SlotProxy::operator=(const T& rhs) {
-    set(wrap(rhs));
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 
@@ -97,7 +97,7 @@ template <typename CLASS>
 template <typename T>
 typename TagProxyPolicy<CLASS>::TagProxy&
 TagProxyPolicy<CLASS>::TagProxy::operator=(const T& rhs) {
-    set( wrap(rhs) );
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 
@@ -128,7 +128,7 @@ template <typename CLASS>
 template <typename T>
 typename BindingPolicy<CLASS>::Binding&
 BindingPolicy<CLASS>::Binding::operator=(const T& rhs) {
-    set(wrap(rhs));
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 
@@ -149,15 +149,15 @@ template <typename CLASS>
 template <typename T>
 typename DottedPairProxyPolicy<CLASS>::DottedPairProxy&
 DottedPairProxyPolicy<CLASS>::DottedPairProxy::operator=(const T& rhs) {
-    set(wrap(rhs));
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 
 template <typename CLASS>
 template <typename T>
 typename DottedPairProxyPolicy<CLASS>::DottedPairProxy&
 DottedPairProxyPolicy<CLASS>::DottedPairProxy::operator=(const traits::named_object<T>& rhs) {
-    return set(wrap(rhs.object), rhs.name);
+    return set(Shield<SEXP>(wrap(rhs.object)), rhs.name);
 }
 
 template <typename CLASS>
@@ -184,9 +184,7 @@ template <typename CLASS>
 template <typename T>
 typename FieldProxyPolicy<CLASS>::FieldProxy&
 FieldProxyPolicy<CLASS>::FieldProxy::operator=(const T& rhs) {
-    SEXP tmp = PROTECT(wrap(rhs));
-    set(tmp);
-    UNPROTECT(1);
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 

inst/include/Rcpp/proxy/ProtectedProxy.h

@@ -32,7 +32,7 @@ namespace Rcpp{
 
             template <typename U>
             ProtectedProxy& operator=( const U& u) {
-              set( wrap( u ) );
+              set(Shield<SEXP>(wrap(u)));
               return *this;
             }
 

inst/include/Rcpp/vector/generic_proxy.h

@@ -47,7 +47,7 @@ namespace internal{
 
 			template <typename T>
 			generic_proxy& operator=( const T& rhs){
-				set(wrap(rhs)) ;
+				set(Shield<SEXP>(wrap(rhs))) ;
 				return *this;
 			}
 

inst/include/Rcpp/vector/proxy.h

@@ -151,7 +151,7 @@ namespace internal{
 
 		template <typename T>
 		generic_name_proxy& operator=( const T& rhs ){
-			set( ::Rcpp::wrap(rhs) ) ;
+		    set(Shield<SEXP>(wrap(rhs)));
 			return *this ;
 		}
 
@@ -249,7 +249,7 @@ namespace traits {
 	template<> struct r_vector_iterator<VECSXP> : proxy_based_iterator<VECSXP>{} ;
 	template<> struct r_vector_iterator<EXPRSXP> : proxy_based_iterator<EXPRSXP>{} ;
 	template<> struct r_vector_iterator<STRSXP> : proxy_based_iterator<STRSXP>{} ;
-	
+
 	template <int RTYPE> struct proxy_based_const_iterator{
 		typedef ::Rcpp::internal::Proxy_Iterator< typename r_vector_const_proxy<RTYPE>::type > type ;
 	} ;