php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-13 19:14:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3'

Browse Source
This commit is contained in:
Nikita Popov
2018-10-08 13:16:54 +02:00
parent b0e1b43c6c d982bbe175
commit 01cc547f44
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ext/standard/tests/serialize/serialize_globals_var_refs.phpt Normal file
View File

@@ -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) {
}
}

6
ext/standard/var.c
View File

@@ -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)) {