ffi: leak: remember to call destructor in dart_deleter

Otherwise `unique_dart_ptr<DecodeBarcodeParams>` accidentally leaks the inner image bytes!
iezed · Jun 12, 2024 · 7d2b7aa · 7d2b7aa
1 parent f6f4c3f
commit 7d2b7aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/dart_alloc.h b/src/dart_alloc.h
@@ -94,7 +94,11 @@ struct dart_deleter {
     template <typename T>
     void operator()(T* p) const noexcept
     {
-        dart_allocator<T>{}.deallocate(p, 1);
+        if (p != nullptr) {
+            // A "deleter" also needs to run p's destructor before free'ing.
+            p->~T();
+            dart_allocator<T>{}.deallocate(p, 1);
+        }
     }
 };
 

diff --git a/src/native_zxing.h b/src/native_zxing.h
@@ -46,6 +46,7 @@ extern "C"
             dart_free(bytes);
         }
 
+        // Disable copy/move contsructors
         DecodeBarcodeParams(const DecodeBarcodeParams&) = delete;
         DecodeBarcodeParams& operator=(const DecodeBarcodeParams&) = delete;
         DecodeBarcodeParams(DecodeBarcodeParams&&) = delete;
@@ -71,6 +72,7 @@ extern "C"
             dart_free(contents);
         }
 
+        // Disable copy/move contsructors
         EncodeBarcodeParams(const EncodeBarcodeParams&) = delete;
         EncodeBarcodeParams& operator=(const EncodeBarcodeParams&) = delete;
         EncodeBarcodeParams(EncodeBarcodeParams&&) = delete;