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

Dispose persisted v8::Script object on resource dtor (memory leak)

Browse Source
This commit is contained in:
Stefan Siegl 2015-08-02 22:36:23 +02:00
parent 1f56c8e43c
commit cb7a1b8d6a
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
v8js_class.cc
View File

@ -50,7 +50,7 @@ typedef struct _v8js_script {
v8::Persistent<v8::Script, v8::CopyablePersistentTraits<v8::Script>> *script;
} v8js_script;
static void v8js_script_free(v8js_script *res, bool dispose_persistent);
static void v8js_script_free(v8js_script *res);
int le_v8js_script;
@ -545,7 +545,7 @@ static PHP_METHOD(V8Js, executeString)
RETURN_FALSE;
}
v8js_execute_script(getThis(), res, flags, time_limit, memory_limit, &return_value TSRMLS_CC);
v8js_script_free(res, true);
v8js_script_free(res);
efree(res);
}
/* }}} */
@ -611,7 +611,7 @@ static PHP_METHOD(V8Js, checkString)
RETURN_FALSE;
}
v8js_script_free(res, true);
v8js_script_free(res);
efree(res);
RETURN_TRUE;
}
@ -768,23 +768,17 @@ static void v8js_persistent_zval_dtor(zval **p) /* {{{ */
}
/* }}} */
static void v8js_script_free(v8js_script *res, bool dispose_persistent)
static void v8js_script_free(v8js_script *res)
{
if (res->name) {
efree(res->name);
res->name = NULL;
}
if (dispose_persistent) {
delete res->script; // does Reset()
res->script = NULL;
}
efree(res->name);
delete res->script; // does Reset()
}
static void v8js_script_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
{
v8js_script *res = (v8js_script *)rsrc->ptr;
if (res) {
v8js_script_free(res, false);
v8js_script_free(res);
efree(res);
}
}