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

eddelbuettel · eddelbuettel · commit 2bbc24494567 · 2014-11-25T21:51:20.000-06:00
additional protection via Shield&lt;SEXP&gt; for tail objects, as suggested by...
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-25  Dirk Eddelbuettel  <edd@debian.org>
+
+        * 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  <edd@debian.org>
 
         * inst/include/Rcpp/config.h: Release version is still 0.11.3
diff --git a/inst/NEWS.Rd b/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{
diff --git a/inst/include/Rcpp/grow.h b/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>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`\item \code{Rcpp::stop} now supports improved \code{printf}-like syntax`
`15`	`15`	`using the small tinyformat header-only library (following a similar`
`16`	`16`	`implementation in Rcpp11)`
	`17`	`+ \item Pairlist objects are now protected via an additional \code{Shield<>}`
	`18`	`+ as suggested by Martin Morgan on the rcpp-devel list.`
`17`	`19`	`}`
`18`	`20`	`\item Changes in Rcpp Attributes:`
`19`	`21`	`\itemize{`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,13 @@ namespace Rcpp {`
`61`	`61`	`*/`
`62`	`62`	`template <typename T>`
`63`	`63`	`SEXP grow(const T& head, SEXP tail) {`
`64`		`- return internal::grow__dispatch( typename traits::is_named<T>::type(), head, tail );`
	`64`	`+ Shield<SEXP> y(tail);`
	`65`	`+ return internal::grow__dispatch(typename traits::is_named<T>::type(), head, y);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`inline SEXP grow( const char* head, SEXP tail ) {`
`68`		`- return grow( Rf_mkString(head), tail ) ;`
	`69`	`+ Shield<SEXP> y(tail);`
	`70`	`+ return grow(Rf_mkString(head), y);`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`#include <Rcpp/generated/grow__pairlist.h>`