diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-08 13:16:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-08 13:16:54 +0200 |
| commit | 01cc547f4459f57646febaff931e5d0af863d2df (patch) | |
| tree | 8a26b25741c3e701ae836682c496429e3df69487 /ext | |
| parent | b0e1b43c6c914aa86ed1151660f198327cf3b702 (diff) | |
| parent | d982bbe175b6f4487683f538f2dc8aca4aef4a6b (diff) | |
| download | php-git-01cc547f4459f57646febaff931e5d0af863d2df.tar.gz | |
Merge branch 'PHP-7.3'
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/tests/serialize/serialize_globals_var_refs.phpt | 22 | ||||
| -rw-r--r-- | ext/standard/var.c | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/ext/standard/tests/serialize/serialize_globals_var_refs.phpt b/ext/standard/tests/serialize/serialize_globals_var_refs.phpt new file mode 100644 index 0000000000..3f03cc2a21 --- /dev/null +++ b/ext/standard/tests/serialize/serialize_globals_var_refs.phpt @@ -0,0 +1,22 @@ +--TEST-- +Reference IDs should be correctly generated when $GLOBALS is serialized +--FILE-- +<?php + +$obj = new stdClass; +$obj2 = new stdClass; +$obj2->obj = $obj; +$s = serialize($GLOBALS); +$globals = unserialize($s); +var_dump($obj); +var_dump($obj2); + +?> +--EXPECT-- +object(stdClass)#1 (0) { +} +object(stdClass)#2 (1) { + ["obj"]=> + object(stdClass)#1 (0) { + } +} diff --git a/ext/standard/var.c b/ext/standard/var.c index e4c7932868..77b290a6cc 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -959,9 +959,9 @@ again: /* we should still add element even if it's not OK, * since we already wrote the length of the array before */ if (Z_TYPE_P(data) == IS_ARRAY) { - if (Z_TYPE_P(data) == IS_ARRAY - && (UNEXPECTED(Z_IS_RECURSIVE_P(data)) - || UNEXPECTED(Z_TYPE_P(struc) == IS_ARRAY && Z_ARR_P(data) == Z_ARR_P(struc)))) { + if (UNEXPECTED(Z_IS_RECURSIVE_P(data)) + || UNEXPECTED(Z_TYPE_P(struc) == IS_ARRAY && Z_ARR_P(data) == Z_ARR_P(struc))) { + php_add_var_hash(var_hash, struc); smart_str_appendl(buf, "N;", 2); } else { if (Z_REFCOUNTED_P(data)) { |