Simplify

Author: kleisauke

src/FFI.php

@@ -539,6 +539,8 @@ private static function init(): void
 typedef void (*FreeFn)(void* a);
 void vips_value_set_blob (GValue* value,
     FreeFn free_fn, void* data, size_t length);
+void* vips_blob_copy (const void *data, size_t length);
+void vips_area_unref (void *area);
 
 const char* vips_value_get_ref_string (const GValue* value,
     size_t* length);
@@ -760,8 +762,7 @@ private static function init(): void
 
 VipsSource* vips_source_new_from_descriptor (int descriptor);
 VipsSource* vips_source_new_from_file (const char* filename);
-VipsSource* vips_source_new_from_memory (const void* data,
-    size_t size);
+VipsSource* vips_source_new_from_blob (void* blob);
 
 typedef struct _VipsSourceCustom {
     VipsSource parent_object;

src/Source.php

@@ -12,16 +12,6 @@ class Source extends Connection
      */
     public \FFI\CData $pointer;
 
-    /**
-     * Pointer to the underlying memory buffer when using
-     * @see Source::newFromMemory()
-     *
-     * Must be freed when no longer needed.
-     *
-     * @internal
-     */
-    public ?\FFI\CData $memory = null;
-
     public function __construct(\FFI\CData $pointer)
     {
         $this->pointer = FFI::vips()->cast(FFI::ctypes('VipsSource'), $pointer);
@@ -74,27 +64,19 @@ public static function newFromFile(string $filename): self
      */
     public static function newFromMemory(string $data): self
     {
-        # we need to set the memory to a copy of the data
-        $n = strlen($data);
-        $memory = FFI::vips()->new("char[$n]", false, true);
-        \FFI::memcpy($memory, $data, $n);
-        $pointer = FFI::vips()->vips_source_new_from_memory($memory, $n);
+        $blob = FFI::vips()->vips_blob_copy($data, strlen($data));
+        if ($blob === null) {
+            throw new Exception("can't create source from memory");
+        }
 
+        $pointer = FFI::vips()->vips_source_new_from_blob($blob);
         if ($pointer === null) {
-            \FFI::free($memory);
+            FFI::vips()->vips_area_unref($blob);
             throw new Exception("can't create source from memory");
         }
 
         $source = new self($pointer);
-        $source->memory = $memory;
+        FFI::vips()->vips_area_unref($blob);
         return $source;
     }
-
-    public function __destruct()
-    {
-        if ($this->memory !== null) {
-            \FFI::free($this->memory);
-        }
-        parent::__destruct();
-    }
 }