Bandaid for protection issue in FieldProxy (#121)

kevinushey · kevinushey · commit 30bd875381ee · 2014-03-05T12:34:48.000-08:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-05  Kevin Ushey <kevinushey@gmail.com>
+
+        * inst/include/Rcpp/proxy/FieldProxy.h: bandaid for protection issue
+        in operator= of FieldProxy
+
 2014-03-03  Kevin Ushey <kevinushey@gmail.com>
 
         * inst/include/Rcpp/proxy/SlotProxy.h: Add missing const_SlotProxy ctor
diff --git a/inst/include/Rcpp/proxy/FieldProxy.h b/inst/include/Rcpp/proxy/FieldProxy.h
@@ -35,8 +35,10 @@ class FieldProxyPolicy {
         }
               
         template <typename T> FieldProxy& operator=(const T& rhs) {
-          set( wrap(rhs) );
-          return *this;
+            SEXP tmp = PROTECT( wrap(rhs) );
+            set(tmp);
+            UNPROTECT(1);
+            return *this;
         }
             
         template <typename T> operator T() const {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2014-03-05  Kevin Ushey <[email protected]>
++
 +        * inst/include/Rcpp/proxy/FieldProxy.h: bandaid for protection issue
 +        in operator= of FieldProxy
++
 -03-03  Kevin Ushey <[email protected]>
         * inst/include/Rcpp/proxy/SlotProxy.h: Add missing const_SlotProxy ctor
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,10 @@ class FieldProxyPolicy {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`template <typename T> FieldProxy& operator=(const T& rhs) {`
`38`		`- set( wrap(rhs) );`
`39`		`- return *this;`
	`38`	`+ SEXP tmp = PROTECT( wrap(rhs) );`
	`39`	`+ set(tmp);`
	`40`	`+ UNPROTECT(1);`
	`41`	`+ return *this;`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`template <typename T> operator T() const {`