Fix bug when object handle reused but previous state was not clean

Author: pinepain

php_ref_reference.c

@@ -152,8 +152,10 @@ static void php_ref_maybe_restore_handlers(php_ref_referent_t *referent)
         return;
     }
 
-    Z_OBJ(referent->this_ptr)->handlers = referent->original_handlers;
-    referent->original_handlers = NULL;
+    if (referent->original_handlers) {
+        Z_OBJ(referent->this_ptr)->handlers = referent->original_handlers;
+        referent->original_handlers = NULL;
+    }
 }
 
 void php_ref_referent_object_dtor_obj(zend_object *object)
@@ -234,6 +236,10 @@ void php_ref_referent_abstract_references_ht_dtor(zval *zv)
     if (reference->referent) {
         reference->referent->tracked--;
         php_ref_maybe_restore_handlers(reference->referent);
+
+        if (!reference->referent->tracked) {
+            zend_hash_index_del(PHP_REF_G(referents), reference->referent->handle);
+        }
     }
 
     /* clean links to ht & release callbacks as we don't need them already*/

tests/002-WeakReference-object-handle-reuse.phpt

@@ -0,0 +1,78 @@
+--TEST--
+Ref\WeakReference - reference should work for newly create tracked objects with same handles as previously tracked objects
+--SKIPIF--
+<?php if (!extension_loaded("ref")) print "skip"; ?>
+--FILE--
+<?php
+
+use Ref\WeakReference;
+
+/** @var \Testsuite $helper */
+$helper = require '.testsuite.php';
+
+
+class Test {
+    public $storage = [];
+
+    public function put($key, $value, string $hash)
+    {
+        $key = new WeakReference($key, function () use ($hash) {
+            unset($this->storage[$hash]);
+        });
+
+        $value = new WeakReference($value, function () use ($hash) {
+            unset($this->storage[$hash]);
+        });
+
+        $this->storage[$hash] = [$key, $value];
+    }
+}
+
+
+$map = new Test();
+
+$key_1   = new stdClass();
+$value_1 = new stdClass();
+
+$key_2   = new stdClass();
+$value_2 = new stdClass();
+
+$map->put($key_1, $value_1, 'test_1');
+$map->put($key_2, $value_2, 'test_2');
+
+$helper->assert('count', 2, count($map->storage));
+
+
+$key_1 = null;
+$helper->assert('count', 1, count($map->storage));
+
+
+$value_2 = null;
+$helper->assert('count', 0, count($map->storage));
+
+$key_1   = new stdClass();
+$value_1 = new stdClass();
+
+$key_2   = new stdClass();
+$value_2 = new stdClass();
+
+$map->put($key_1, $value_1, 'test_1');
+$map->put($key_2, $value_2, 'test_2');
+
+$helper->assert('count', 2, count($map->storage));
+
+$key_1 = null;
+$helper->assert('count', 1, count($map->storage));
+
+$value_2 = null;
+$helper->assert('count', 0, count($map->storage));
+
+
+?>
+--EXPECT--
+count: ok
+count: ok
+count: ok
+count: ok
+count: ok
+count: ok