Fix double free when passing unique_ptr by value

HGuillemet · Jan 19, 2024 · 8b0a1ce · 8b0a1ce
1 parent f540614
commit 8b0a1ce
Showing 1 changed file with 2 additions and 2 deletions.
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;");