Explicitly protect temporary vector in no_init()

krlmlr · krlmlr · commit 5dbfca11da32 · 2018-08-18T09:51:18.000+02:00
diff --git a/inst/include/Rcpp/vector/no_init.h b/inst/include/Rcpp/vector/no_init.h
@@ -35,9 +35,12 @@ class no_init_vector {
         return size;
     }
 
-    template <int RTYPE, template <class> class StoragePolicy >
-    operator Vector<RTYPE, StoragePolicy>() const {
-        return Rf_allocVector(RTYPE, size) ;
+    template <int RTYPE>
+    operator Vector<RTYPE, PreserveStorage>() const {
+        SEXP x = PROTECT(Rf_allocVector(RTYPE, size));
+        Vector<RTYPE, PreserveStorage> ret(x);
+        UNPROTECT(1);
+        return ret;
     }
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,12 @@ class no_init_vector {`
`35`	`35`	`return size;`
`36`	`36`	`}`
`37`	`37`
`38`		`- template <int RTYPE, template <class> class StoragePolicy >`
`39`		`- operator Vector<RTYPE, StoragePolicy>() const {`
`40`		`- return Rf_allocVector(RTYPE, size) ;`
	`38`	`+ template <int RTYPE>`
	`39`	`+ operator Vector<RTYPE, PreserveStorage>() const {`
	`40`	`+ SEXP x = PROTECT(Rf_allocVector(RTYPE, size));`
	`41`	`+ Vector<RTYPE, PreserveStorage> ret(x);`
	`42`	`+ UNPROTECT(1);`
	`43`	`+ return ret;`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`private:`