From 3e2132eaaec3829fc7f359350da19e36cd188397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Sat, 7 Dec 2024 20:47:09 +0100
Subject: [PATCH] fix: Avoid premature release for external pointers

---
 inst/include/cpp11/external_pointer.hpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/inst/include/cpp11/external_pointer.hpp b/inst/include/cpp11/external_pointer.hpp
index a62134ec..2f895b51 100644
--- a/inst/include/cpp11/external_pointer.hpp
+++ b/inst/include/cpp11/external_pointer.hpp
@@ -66,9 +66,15 @@ class external_pointer {
     data_ = safe[Rf_shallow_duplicate](rhs.data_);
   }
 
-  external_pointer(external_pointer&& rhs) { reset(rhs.release()); }
+  external_pointer(external_pointer&& rhs) {
+    data_ = rhs.data_;
+    rhs.data_ = R_NilValue;
+  }
 
-  external_pointer& operator=(external_pointer&& rhs) noexcept { reset(rhs.release()); }
+  external_pointer& operator=(external_pointer&& rhs) noexcept {
+    data_ = rhs.data_;
+    rhs.data_ = R_NilValue;
+  }
 
   external_pointer& operator=(std::nullptr_t) noexcept { reset(); };