clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup tmp_member handling

Browse Source
This commit is contained in:
Xinchen Hui 2015-09-10 14:39:25 +08:00
parent 27f6b8864e
commit 6852f9cd43
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zend/zend_object_handlers.c
View File

@ -602,11 +602,10 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_
retval = &EG(uninitialized_zval);
exit:
if (UNEXPECTED(Z_TYPE(tmp_member) != IS_UNDEF)) {
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
if (Z_REFCOUNTED(tmp_member)) {
zval_ptr_dtor(&tmp_member);
if (Z_REFCOUNTED_P(retval)) Z_DELREF_P(retval);
}
return retval;
}
/* }}} */
@ -703,7 +702,7 @@ write_std_property:
}
exit:
if (UNEXPECTED(Z_TYPE(tmp_member) != IS_UNDEF)) {
if (Z_REFCOUNTED(tmp_member)) {
zval_ptr_dtor(&tmp_member);
}
}
@ -935,7 +934,7 @@ static void zend_std_unset_property(zval *object, zval *member, void **cache_slo
}
exit:
if (UNEXPECTED(Z_TYPE(tmp_member) != IS_NULL)) {
if (Z_REFCOUNTED(tmp_member)) {
zval_ptr_dtor(&tmp_member);
}
}
@ -1507,7 +1506,7 @@ found:
}
exit:
if (UNEXPECTED(Z_TYPE(tmp_member) != IS_UNDEF)) {
if (Z_REFCOUNTED(tmp_member)) {
zval_ptr_dtor(&tmp_member);
}
return result;