Guard two uses of get_p() against R_NilValue

r-lib · Aug 21, 2024 · bfb4a9b · bfb4a9b
1 parent e2362a2
commit bfb4a9b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/inst/include/cpp11/r_vector.hpp b/inst/include/cpp11/r_vector.hpp
@@ -787,7 +787,7 @@ inline r_vector<T>::r_vector(const r_vector& rhs) {
   data_ = safe[Rf_shallow_duplicate](rhs.data_);
   protect_ = detail::store::insert(data_);
   is_altrep_ = ALTREP(data_);
-  data_p_ = get_p(is_altrep_, data_);
+  data_p_ = (data_ == R_NilValue) ? nullptr : get_p(is_altrep_, data_);
   length_ = rhs.length_;
   capacity_ = rhs.capacity_;
 }
@@ -925,7 +925,7 @@ inline r_vector<T>& r_vector<T>::operator=(const r_vector& rhs) {
   data_ = safe[Rf_shallow_duplicate](rhs.data_);
   protect_ = detail::store::insert(data_);
   is_altrep_ = ALTREP(data_);
-  data_p_ = get_p(is_altrep_, data_);
+  data_p_ = (data_ == R_NilValue) ? nullptr : get_p(is_altrep_, data_);
   length_ = rhs.length_;
   capacity_ = rhs.capacity_;