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

zend_hash_add might return NULL in ext/standard/tests/serialize/serialization_objects_011.php

Browse Source
This commit is contained in:
Xinchen Hui
2014-02-25 18:29:20 +08:00
parent 346d52c2c4
commit 40a9132de8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_object_handlers.c
View File

@@ -86,7 +86,9 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */
prop_info->offset >= 0 &&
Z_TYPE(zobj->properties_table[prop_info->offset]) != IS_UNDEF) {
zval *zv = zend_hash_add(zobj->properties, prop_info->name, &zobj->properties_table[prop_info->offset]);
ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv);
if (EXPECTED(zv)) {
ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv);
}
}
}
while (ce->parent && ce->parent->default_properties_count) {
@@ -100,7 +102,9 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */
prop_info->offset >= 0 &&
Z_TYPE(zobj->properties_table[prop_info->offset]) != IS_UNDEF) {
zval *zv = zend_hash_add(zobj->properties, prop_info->name, &zobj->properties_table[prop_info->offset]);
ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv);
if (EXPECTED(zv)) {
ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv);
}
}
}
}