Ensure we do not create C++ objects in unwind_protect

Author: jimhester

inst/include/cpp11/doubles.hpp

@@ -79,19 +79,22 @@ template <>
 inline r_vector<double>::r_vector(std::initializer_list<named_arg> il)
     : cpp11::r_vector<double>(safe[Rf_allocVector](REALSXP, il.size())),
       capacity_(il.size()) {
+  protect_ = protect_sexp(data_);
+
   try {
     unwind_protect([&] {
-      protect_ = protect_sexp(data_);
       Rf_setAttrib(data_, R_NamesSymbol, Rf_allocVector(STRSXP, capacity_));
-      sexp names(Rf_getAttrib(data_, R_NamesSymbol));
+      SEXP names = PROTECT(Rf_getAttrib(data_, R_NamesSymbol));
       auto it = il.begin();
       for (R_xlen_t i = 0; i < capacity_; ++i, ++it) {
-        data_p_[i] = doubles(it->value())[0];
+        data_p_[i] = REAL_ELT(it->value(), 0);
         SET_STRING_ELT(names, i, Rf_mkCharCE(it->name(), CE_UTF8));
       }
+      UNPROTECT(1);
     });
   } catch (const unwind_exception& e) {
     release_protect(protect_);
+    UNPROTECT(1);
     throw e;
   }
 }

inst/include/cpp11/integers.hpp

@@ -96,19 +96,22 @@ template <>
 inline r_vector<int>::r_vector(std::initializer_list<named_arg> il)
     : cpp11::r_vector<int>(safe[Rf_allocVector](INTSXP, il.size())),
       capacity_(il.size()) {
+  protect_ = protect_sexp(data_);
+
   try {
     unwind_protect([&] {
-      protect_ = protect_sexp(data_);
-      attr("names") = Rf_allocVector(STRSXP, capacity_);
-      sexp names(attr("names"));
+      Rf_setAttrib(data_, R_NamesSymbol, Rf_allocVector(STRSXP, capacity_));
+      SEXP names = PROTECT(Rf_getAttrib(data_, R_NamesSymbol));
       auto it = il.begin();
       for (R_xlen_t i = 0; i < capacity_; ++i, ++it) {
-        data_p_[i] = integers(it->value())[0];
+        data_p_[i] = INTEGER_ELT(it->value(), 0);
         SET_STRING_ELT(names, i, Rf_mkCharCE(it->name(), CE_UTF8));
       }
+      UNPROTECT(1);
     });
   } catch (const unwind_exception& e) {
     release_protect(protect_);
+    UNPROTECT(1);
     throw e;
   }
 }

inst/include/cpp11/logicals.hpp

@@ -82,19 +82,22 @@ template <>
 inline r_vector<Rboolean>::r_vector(std::initializer_list<named_arg> il)
     : cpp11::r_vector<Rboolean>(safe[Rf_allocVector](LGLSXP, il.size())),
       capacity_(il.size()) {
+  protect_ = protect_sexp(data_);
+
   try {
     unwind_protect([&] {
-      protect_ = protect_sexp(data_);
-      attr("names") = Rf_allocVector(STRSXP, capacity_);
-      sexp names(attr("names"));
+      Rf_setAttrib(data_, R_NamesSymbol, Rf_allocVector(STRSXP, capacity_));
+      SEXP names = PROTECT(Rf_getAttrib(data_, R_NamesSymbol));
       auto it = il.begin();
       for (R_xlen_t i = 0; i < capacity_; ++i, ++it) {
-        data_p_[i] = logicals(it->value())[0];
+        data_p_[i] = static_cast<Rboolean>(LOGICAL_ELT(it->value(), 0));
         SET_STRING_ELT(names, i, Rf_mkCharCE(it->name(), CE_UTF8));
       }
+      UNPROTECT(1);
     });
   } catch (const unwind_exception& e) {
     release_protect(protect_);
+    UNPROTECT(1);
     throw e;
   }
 }

inst/include/cpp11/raws.hpp

@@ -89,19 +89,22 @@ template <>
 inline r_vector<uint8_t>::r_vector(std::initializer_list<named_arg> il)
     : cpp11::r_vector<uint8_t>(safe[Rf_allocVector](RAWSXP, il.size())),
       capacity_(il.size()) {
+  protect_ = protect_sexp(data_);
+
   try {
     unwind_protect([&] {
-      protect_ = protect_sexp(data_);
-      attr("names") = Rf_allocVector(STRSXP, capacity_);
-      sexp names(attr("names"));
+      Rf_setAttrib(data_, R_NamesSymbol, Rf_allocVector(STRSXP, capacity_));
+      SEXP names = PROTECT(Rf_getAttrib(data_, R_NamesSymbol));
       auto it = il.begin();
       for (R_xlen_t i = 0; i < capacity_; ++i, ++it) {
-        data_p_[i] = cpp11::raws(it->value())[0];
+        data_p_[i] = RAW_ELT(it->value(), 0);
         SET_STRING_ELT(names, i, Rf_mkCharCE(it->name(), CE_UTF8));
       }
+      UNPROTECT(1);
     });
   } catch (const unwind_exception& e) {
     release_protect(protect_);
+    UNPROTECT(1);
     throw e;
   }
 }

inst/include/cpp11/strings.hpp

@@ -124,19 +124,22 @@ template <>
 inline r_vector<r_string>::r_vector(std::initializer_list<named_arg> il)
     : cpp11::r_vector<r_string>(safe[Rf_allocVector](STRSXP, il.size())),
       capacity_(il.size()) {
+  protect_ = protect_sexp(data_);
+
   try {
     unwind_protect([&] {
-      protect_ = protect_sexp(data_);
-      attr("names") = Rf_allocVector(STRSXP, capacity_);
-      sexp names(attr("names"));
+      Rf_setAttrib(data_, R_NamesSymbol, Rf_allocVector(STRSXP, capacity_));
+      SEXP names = PROTECT(Rf_getAttrib(data_, R_NamesSymbol));
       auto it = il.begin();
       for (R_xlen_t i = 0; i < capacity_; ++i, ++it) {
-        SET_STRING_ELT(data_, i, strings(it->value())[0]);
+        SET_STRING_ELT(data_, i, STRING_ELT(it->value(), 0));
         SET_STRING_ELT(names, i, Rf_mkCharCE(it->name(), CE_UTF8));
       }
+      UNPROTECT(1);
     });
   } catch (const unwind_exception& e) {
     release_protect(protect_);
+    UNPROTECT(1);
     throw e;
   }
 }