Skip to content
This repository was archived by the owner on Mar 29, 2024. It is now read-only.

Commit 28addc8

Browse files
committed
Do not make objects weak on shutdown
1 parent 7750040 commit 28addc8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/php_v8_function_template.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static void php_v8_function_template_free(zend_object *object) {
8787
* unmarked as week? Note, that the only action on weak handler callback is Reset()ing persistent handler.
8888
*
8989
* */
90-
if (!CG(unclean_shutdown) && php_v8_function_template->persistent_data && !php_v8_function_template->persistent_data->empty()) {
90+
if (zend_is_executing() && !CG(unclean_shutdown) && php_v8_function_template->persistent_data && !php_v8_function_template->persistent_data->empty()) {
9191
php_v8_function_template_make_weak(php_v8_function_template);
9292
}
9393

src/php_v8_object_template.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static HashTable * php_v8_object_template_gc(zval *object, zval **table, int *n)
8181
static void php_v8_object_template_free(zend_object *object) {
8282
php_v8_object_template_t *php_v8_object_template = php_v8_object_template_fetch_object(object);
8383

84-
if (!CG(unclean_shutdown) && php_v8_object_template->persistent_data && !php_v8_object_template->persistent_data->empty()) {
84+
if (zend_is_executing() && !CG(unclean_shutdown) && php_v8_object_template->persistent_data && !php_v8_object_template->persistent_data->empty()) {
8585
php_v8_object_template_make_weak(php_v8_object_template);
8686
}
8787

src/php_v8_value.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static void php_v8_value_free(zend_object *object) {
133133

134134

135135
// TODO: making weak makes sense for objects only
136-
if (!CG(unclean_shutdown) && php_v8_value->persistent_data && !php_v8_value->persistent_data->empty()) {
136+
if (zend_is_executing() && !CG(unclean_shutdown) && php_v8_value->persistent_data && !php_v8_value->persistent_data->empty()) {
137137
php_v8_value_make_weak(php_v8_value); // TODO: refactor logic for make weak to include checking whether it can be weak -> maybe_make_weak
138138
}
139139

0 commit comments

Comments
 (0)