* Fix MoveAdapter and UniquePtrAdapter causing double free on fu…

…nction calls (pull #738)
bytedeco · Jan 20, 2024 · 314f760 · 314f760
1 parent f540614
commit 314f760
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `MoveAdapter` and `UniquePtrAdapter` causing double free on function calls ([pull #738](https://github.com/bytedeco/javacpp/pull/738))
  * Fix `Parser` handling of `template` specialization and their `friend` declarations ([pull #733](https://github.com/bytedeco/javacpp/pull/733))
  * Improve `Parser` capabilities for `operator` and function templates ([pull #732](https://github.com/bytedeco/javacpp/pull/732))
  * Fix `Parser` failing on nested initializer lists and on attributes found inside `enum` declarations

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Generator.java b/src/main/java/org/bytedeco/javacpp/tools/Generator.java
@@ -1408,7 +1408,7 @@ boolean classes(boolean handleExceptions, boolean defineAdapters, boolean conver
             out.println("        return (typename UNIQUE_PTR_NAMESPACE::remove_const<T>::type*)ptr;");
             out.println("    }");
             out.println("    operator U&() const { return uniquePtr; }");
-            out.println("    operator U&&() { return UNIQUE_PTR_NAMESPACE::move(uniquePtr); }");
+            out.println("    operator U&&() { owner = NULL; return UNIQUE_PTR_NAMESPACE::move(uniquePtr); }");
             out.println("    operator U*() { return &uniquePtr; }");
             out.println("    T* ptr;");
             out.println("    size_t size;");
@@ -1437,7 +1437,7 @@ boolean classes(boolean handleExceptions, boolean defineAdapters, boolean conver
             out.println("        return ptr;");
             out.println("    }");
             out.println("    operator const T*() { return ptr; }");
-            out.println("    operator T&&() { return MOVE_NAMESPACE::move(movedPtr); }");
+            out.println("    operator T&&() { owner = NULL; return MOVE_NAMESPACE::move(movedPtr); }");
             out.println("    T* ptr;");
             out.println("    size_t size;");
             out.println("    void* owner;");