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

Track list of valid script object in ctx

Browse Source 
We don't know whether the V8Js object dtor or the script (resource)
dtor is called first.  Nevertheless they depend on each other as
we must not simply Reset the persistent v8::Script if the v8::Isolate
was disposed before.

Now the V8Js dtor iterates over all script resources and resets the
persistent v8::Script instances; leaving an invalidated resource
object (which cannot be called anymore).
This commit is contained in:
Stefan Siegl 2015-08-02 23:35:47 +02:00
parent cb7a1b8d6a
commit 0deb7d1802
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
v8js_class.cc
View File

@ -33,6 +33,7 @@ extern "C" {
#include "v8js_timer.h"
#include <functional>
#include <algorithm>
#define PHP_V8JS_SCRIPT_RES_NAME "V8Js script"
@ -46,7 +47,7 @@ static zend_object_handlers v8js_object_handlers;
typedef struct _v8js_script {
char *name;
v8::Isolate *isolate;
v8js_ctx *ctx;
v8::Persistent<v8::Script, v8::CopyablePersistentTraits<v8::Script>> *script;
} v8js_script;
@ -154,6 +155,13 @@ static void v8js_free_storage(void *object TSRMLS_DC) /* {{{ */
}
c->v8js_v8objects.~list();
for (std::vector<v8js_script *>::iterator it = c->script_objects.begin();
it != c->script_objects.end(); it ++) {
(*it)->ctx = NULL;
(*it)->script->Reset();
}
c->script_objects.~vector();
/* Clear persistent handles in module cache */
for (std::map<char *, v8js_persistent_obj_t>::iterator it = c->modules_loaded.begin();
it != c->modules_loaded.end(); ++it) {
@ -210,6 +218,7 @@ static zend_object_value v8js_new(zend_class_entry *ce TSRMLS_DC) /* {{{ */
new(&c->weak_objects) std::map<zval *, v8js_persistent_obj_t>();
new(&c->v8js_v8objects) std::list<v8js_v8object *>();
new(&c->script_objects) std::vector<v8js_script *>();
retval.handle = zend_objects_store_put(c, NULL, (zend_objects_free_object_storage_t) v8js_free_storage, NULL TSRMLS_CC);
retval.handlers = &v8js_object_handlers;
@ -496,7 +505,7 @@ static void v8js_compile_script(zval *this_ptr, const char *str, int str_len, co
v8::String::Utf8Value _sname(sname);
res->name = estrndup(ToCString(_sname), _sname.length());
res->isolate = c->isolate;
res->ctx = c;
*ret = res;
return;
}
@ -505,7 +514,7 @@ static void v8js_execute_script(zval *this_ptr, v8js_script *res, long flags, lo
{
v8js_ctx *c = (v8js_ctx *) zend_object_store_get_object(getThis() TSRMLS_CC);
if (res->isolate != c->isolate) {
if (res->ctx != c) {
zend_error(E_WARNING, "Script resource from wrong V8Js object passed");
ZVAL_BOOL(*return_value, 0);
return;
@ -566,6 +575,10 @@ static PHP_METHOD(V8Js, compileString)
v8js_compile_script(getThis(), str, str_len, identifier, identifier_len, &res TSRMLS_CC);
if (res) {
ZEND_REGISTER_RESOURCE(return_value, res, le_v8js_script);
v8js_ctx *ctx;
ctx = (v8js_ctx *) zend_object_store_get_object(this_ptr TSRMLS_CC);
ctx->script_objects.push_back(res);
}
return;
}
@ -778,6 +791,11 @@ static void v8js_script_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
{
v8js_script *res = (v8js_script *)rsrc->ptr;
if (res) {
if(res->ctx) {
std::vector<v8js_script *>::iterator it = std::find(res->ctx->script_objects.begin(), res->ctx->script_objects.end(), res);
res->ctx->script_objects.erase(it);
}
v8js_script_free(res);
efree(res);
}

2
v8js_class.h
View File

@ -22,6 +22,7 @@ typedef v8::Persistent<v8::Object, v8::CopyablePersistentTraits<v8::Object> > v8
/* Forward declarations */
struct v8js_v8object;
struct v8js_accessor_ctx;
struct _v8js_script;
/* {{{ Context container */
struct v8js_ctx {
@ -52,6 +53,7 @@ struct v8js_ctx {
std::list<v8js_v8object *> v8js_v8objects;
std::vector<v8js_accessor_ctx *> accessor_list;
std::vector<struct _v8js_script *> script_objects;
char *tz;
#ifdef ZTS
void ***zts_ctx;