summaryrefslogtreecommitdiff
path: root/Zend/zend_objects.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-08-26 03:27:05 +0300
committerDmitry Stogov <dmitry@zend.com>2015-08-26 03:27:05 +0300
commit25f9e255264d8196f51a22707e797977e4cd3995 (patch)
treef6fc4932ee6d03a61cfad3dee970cc7c67e544d4 /Zend/zend_objects.c
parentc1e9bd27fe59b4f860a616a4e04fdb823a1dbff7 (diff)
downloadphp-git-25f9e255264d8196f51a22707e797977e4cd3995.tar.gz
Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
Diffstat (limited to 'Zend/zend_objects.c')
-rw-r--r--Zend/zend_objects.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 9694cd6958..ca7ca52d89 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -204,6 +204,9 @@ ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *o
zend_hash_extend(new_object->properties, new_object->properties->nNumUsed + zend_hash_num_elements(old_object->properties), 0);
}
+ new_object->properties->u.v.flags |=
+ old_object->properties->u.v.flags & HASH_FLAG_HAS_EMPTY_IND;
+
ZEND_HASH_FOREACH_KEY_VAL(old_object->properties, num_key, key, prop) {
if (Z_TYPE_P(prop) == IS_INDIRECT) {
ZVAL_INDIRECT(&new_prop, new_object->properties_table + (Z_INDIRECT_P(prop) - old_object->properties_table));