Merge pull request #208 from RcppCore/feature/protect-grow

additional protection via Shield<SEXP> for tail objects, as suggested by...

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2014-11-25  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/grow.h: Apply additional Shield<> use around tail
+        object as suggested by Martin Morgan on the rcpp-devel list
+
 2014-11-24  Dirk Eddelbuettel  <[email protected]>
 
         * inst/include/Rcpp/config.h: Release version is still 0.11.3

inst/NEWS.Rd

@@ -14,6 +14,8 @@
       \item \code{Rcpp::stop} now supports improved \code{printf}-like syntax
       using the small tinyformat header-only library (following a similar
       implementation in Rcpp11)
+      \item Pairlist objects are now protected via an additional \code{Shield<>}
+      as suggested by Martin Morgan on the rcpp-devel list.
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/grow.h

@@ -61,11 +61,13 @@ namespace Rcpp {
      */
     template <typename T>
     SEXP grow(const T& head, SEXP tail) {
-        return internal::grow__dispatch( typename traits::is_named<T>::type(), head, tail );
+        Shield<SEXP> y(tail);
+        return internal::grow__dispatch(typename traits::is_named<T>::type(), head, y);
     }
 
     inline SEXP grow( const char* head, SEXP tail ) {
-        return grow( Rf_mkString(head), tail ) ;
+        Shield<SEXP> y(tail);
+        return grow(Rf_mkString(head), y);
     }
 
     #include <Rcpp/generated/grow__pairlist.h>