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

Fix some memory leaks.

Browse Source
This commit is contained in:
Stefan Siegl 2014-08-11 15:09:02 +02:00
parent 0334ba64fa
commit 361dd4185c
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v8js_convert.cc
View File

@ -744,11 +744,6 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
zend_call_function(&fci, NULL TSRMLS_CC); zend_call_function(&fci, NULL TSRMLS_CC);
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
* returned refcount was 0, in which case the below code
* will free it. */
zval_add_ref(&php_value);
zval_ptr_dtor(&php_value); zval_ptr_dtor(&php_value);
} }
} else if (callback_type == V8JS_PROP_SETTER) { } else if (callback_type == V8JS_PROP_SETTER) {
@ -795,13 +790,7 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
fci.no_separation = 1; fci.no_separation = 1;
zend_call_function(&fci, NULL TSRMLS_CC); zend_call_function(&fci, NULL TSRMLS_CC);
ret_value = zval_to_v8js(php_ret_value, isolate TSRMLS_CC); ret_value = zval_to_v8js(php_ret_value, isolate TSRMLS_CC);
/* We don't own the reference to php_ret_value... unless the
* returned refcount was 0, in which case the below code
* will free it. */
zval_add_ref(&php_ret_value);
zval_ptr_dtor(&php_ret_value); zval_ptr_dtor(&php_ret_value);
} }
} }
@ -1087,8 +1076,10 @@ v8::Handle<v8::Value> zval_to_v8js(zval *value, v8::Isolate *isolate TSRMLS_DC)
if (instanceof_function(Z_OBJCE_P(value), ce TSRMLS_CC)) { if (instanceof_function(Z_OBJCE_P(value), ce TSRMLS_CC)) {
zval *dtval; zval *dtval;
zend_call_method_with_0_params(&value, NULL, NULL, "getTimestamp", &dtval); zend_call_method_with_0_params(&value, NULL, NULL, "getTimestamp", &dtval);
if (dtval) if (dtval) {
jsValue = V8JS_DATE(((double)Z_LVAL_P(dtval) * 1000.0)); jsValue = V8JS_DATE(((double)Z_LVAL_P(dtval) * 1000.0));
zval_ptr_dtor(&dtval);
}
else else
jsValue = V8JS_NULL; jsValue = V8JS_NULL;
} else } else