From d982bbe175b6f4487683f538f2dc8aca4aef4a6b Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 8 Oct 2018 13:14:54 +0200
Subject: [PATCH] Fix ref ID handling when serializing $GLOBALS

This was already broken previously, but in PHP 7.3 stricter
validation during unserialization made this into an error.
---
 .../serialize/serialize_globals_var_refs.phpt | 22 +++++++++++++++++++
 ext/standard/var.c                            |  6 ++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 ext/standard/tests/serialize/serialize_globals_var_refs.phpt

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 00000000000..3f03cc2a216
--- /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 e4c79328680..77b290a6cc7 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)) {