projects
/
m6w6
/
ext-pq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
6db32a9
)
fix leaks on property read
author
Michael Wallner
<mike@php.net>
Thu, 24 Sep 2020 08:52:28 +0000
(10:52 +0200)
committer
Michael Wallner
<mike@php.net>
Thu, 24 Sep 2020 08:52:28 +0000
(10:52 +0200)
src/php_pq_object.c
patch
|
blob
|
history
diff --git
a/src/php_pq_object.c
b/src/php_pq_object.c
index ae22738fc4f37afa4c240d26914280acfae4f0cc..f84bb28adaba5c50ffdf620221c8966288224610 100644
(file)
--- a/
src/php_pq_object.c
+++ b/
src/php_pq_object.c
@@
-83,8
+83,6
@@
struct apply_pi_to_ht_arg {
unsigned gc:1;
};
unsigned gc:1;
};
-static inline int php_pq_object_read_prop_ex(zend_object *object, zend_string *member, int type, zval *return_value);
-
static int apply_pi_to_ht(zval *p, void *a)
{
zend_property_info *pi = Z_PTR_P(p);
static int apply_pi_to_ht(zval *p, void *a)
{
zend_property_info *pi = Z_PTR_P(p);
@@
-102,13
+100,12
@@
static int apply_pi_to_ht(zval *p, void *a)
} else {
zval tmp_prop, *property;
#if PHP_VERSION_ID < 80000
} else {
zval tmp_prop, *property;
#if PHP_VERSION_ID < 80000
- zval zobj
, zprop
;
+ zval zobj;
ZVAL_OBJ(&zobj, &arg->pq_obj->zo);
ZVAL_OBJ(&zobj, &arg->pq_obj->zo);
- ZVAL_STR(&zprop, pi->name);
- property = php_pq_object_read_prop(&zobj, &zprop, BP_VAR_R, NULL, &tmp_prop);
+ property = zend_read_property_ex(arg->pq_obj->zo.ce, &zobj, pi->name, 0, &tmp_prop);
#else
#else
- property =
php_pq_object_read_prop(&arg->pq_obj->zo, pi->name, BP_VAR_R, NULL
, &tmp_prop);
+ property =
zend_read_property_ex(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name, 0
, &tmp_prop);
#endif
zend_hash_update(arg->ht, pi->name, property);
}
#endif
zend_hash_update(arg->ht, pi->name, property);
}
@@
-229,7
+226,8
@@
zval *php_pq_object_read_prop(zend_object *object, zend_string *member, int type
return zend_std_read_property(object, member, type, cache_slot, tmp);
}
return zend_std_read_property(object, member, type, cache_slot, tmp);
}
- tmp = zend_std_write_property(object, member, tmp, cache_slot);
+ zend_std_write_property(object, member, tmp, cache_slot);
+
if (cache_slot) {
*cache_slot = NULL;
}
if (cache_slot) {
*cache_slot = NULL;
}
@@
-246,10
+244,8
@@
zval *php_pq_object_read_prop(zval *object, zval *member, int type, void **cache
}
zend_string_release(member_str);
}
zend_string_release(member_str);
-#if PHP_VERSON_ID >= 70400
- tmp =
-#endif
- zend_std_write_property(object, member, tmp, cache_slot);
+ zend_std_write_property(object, member, tmp, cache_slot);
+
if (cache_slot) {
*cache_slot = NULL;
}
if (cache_slot) {
*cache_slot = NULL;
}