Remove IS_VAR_RET_REF flag

Instead decide whether a function returned by reference or by value
by checking whether the return value has REFERENCE type. This means
that functions returning by reference must always return a reference
and functions returning by value must not return a reference.

1 files changed, 5 insertions, 0 deletions

diff --git a/ext/standard/var.c b/ext/standard/var.c
index acb1d40c01..76d92a5fd3 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -1080,6 +1080,11 @@ PHP_FUNCTION(unserialize)
 	   in case nesting calls to unserialize */
 	var_push_dtor(&var_hash, return_value);
 
+	/* Ensure return value is a value */
+	if (Z_ISREF_P(return_value)) {
+		zend_unwrap_reference(return_value);
+	}
+
 	PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
 	if (class_hash) {
 		zend_hash_destroy(class_hash);