mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2025-01-03 16:51:52 +00:00
Code Releases Activity

Fix leak in v8 named property setter; clean up v8 named property getter.

Browse Source 
zend_update_property does not own the value after the call; we need to
do the deref ourself.  Tweaks to the getter based on a better understanding
of the zend_read_property API.
This commit is contained in:
C. Scott Ananian 2013-10-27 11:46:39 -04:00
parent a730ddeb67
commit 1976e35b9a
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
v8js_convert.cc
View File

@ -580,30 +580,17 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
if (callback_type == V8JS_PROP_GETTER) { if (callback_type == V8JS_PROP_GETTER) {
/* Nope, not a method -- must be a (case-sensitive) property */ /* Nope, not a method -- must be a (case-sensitive) property */
php_value = zend_read_property(scope, object, V8JS_CONST name, name_len, true TSRMLS_CC); php_value = zend_read_property(scope, object, V8JS_CONST name, name_len, true TSRMLS_CC);
// special case 'NULL' and return an empty value (indicating that // special case uninitialized_zval_ptr and return an empty value
// we don't intercept this property) if the property doesn't // (indicating that we don't intercept this property) if the
// exist. // property doesn't exist.
if (ZVAL_IS_NULL(php_value)) { if (php_value == EG(uninitialized_zval_ptr)) {
const zend_object_handlers *h = Z_OBJ_HT_P(object);
zval *prop;
MAKE_STD_ZVAL(prop);
ZVAL_STRINGL(prop, name, name_len, 1);
if (!h->has_property(object, prop, 2 ZEND_HASH_KEY_NULL TSRMLS_CC))
ret_value = v8::Handle<v8::Value>(); ret_value = v8::Handle<v8::Value>();
else {
ret_value = V8JS_NULL;
}
zval_ptr_dtor(&prop);
} else { } else {
// wrap it // wrap it
ret_value = zval_to_v8js(php_value, isolate TSRMLS_CC); ret_value = zval_to_v8js(php_value, isolate TSRMLS_CC);
} /* We don't own the reference to php_value... unless the
/* php_value is the value in the property table; *usually* we * returned refcount was 0, in which case the below code
* don't own a reference to it (and so don't have to deref). * will free it. */
* But sometimes the value is the result of a __get() call and
* the refcnt of the returned value is 0. In that case, free
* it. */
if (php_value != EG(uninitialized_zval_ptr)) {
zval_add_ref(&php_value); zval_add_ref(&php_value);
zval_ptr_dtor(&php_value); zval_ptr_dtor(&php_value);
} }
@ -615,6 +602,9 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
} else { } else {
ret_value = v8::Handle<v8::Value>(); ret_value = v8::Handle<v8::Value>();
} }
// if PHP wanted to hold on to this value, update_property would
// have bumped the refcount
zval_ptr_dtor(&php_value);
} else if (callback_type == V8JS_PROP_QUERY || } else if (callback_type == V8JS_PROP_QUERY ||
callback_type == V8JS_PROP_DELETER) { callback_type == V8JS_PROP_DELETER) {
const zend_object_handlers *h = Z_OBJ_HT_P(object); const zend_object_handlers *h = Z_OBJ_HT_P(object);