Fix segfaults on unclean shutdown

Author: pinepain

Diff for: php_v8.h

@@ -75,6 +75,7 @@ ZEND_END_MODULE_GLOBALS(v8)
     #define zend_get_executed_scope() EG(scope)
 #endif
 
+#define PHP_V8_IS_UP_AND_RUNNING() (zend_is_executing() && !CG(unclean_shutdown))
 
 /* Always refer to the globals in your function as PHP_V8_G(variable).
    You are encouraged to rename these macros something shorter, see

Diff for: src/php_v8_context.cc

@@ -31,7 +31,7 @@ static void php_v8_context_free(zend_object *object)
     php_v8_context_t *php_v8_context = php_v8_context_fetch_object(object);
 
     if (php_v8_context->context) {
-        if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_context)) {
+        if (PHP_V8_IS_UP_AND_RUNNING() && PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_context)) {
             {
                 PHP_V8_ENTER_STORED_ISOLATE(php_v8_context);
                 PHP_V8_DECLARE_CONTEXT(php_v8_context);

Diff for: src/php_v8_function_template.cc

@@ -79,7 +79,7 @@ static void php_v8_function_template_free(zend_object *object) {
      * unmark it as weak and do all that cleanings in free handler. What about if object will be reused after being
      * unmarked as week? Note, that the only action on weak handler callback is Reset()ing persistent handler.
      */
-    if (zend_is_executing() && !CG(unclean_shutdown) && php_v8_function_template->persistent_data && !php_v8_function_template->persistent_data->empty()) {
+    if (PHP_V8_IS_UP_AND_RUNNING() && php_v8_function_template->persistent_data && !php_v8_function_template->persistent_data->empty()) {
         php_v8_function_template_make_weak(php_v8_function_template);
     }
 
@@ -89,7 +89,7 @@ static void php_v8_function_template_free(zend_object *object) {
         }
 
         if (php_v8_function_template->persistent) {
-            if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_function_template)) {
+            if (PHP_V8_IS_UP_AND_RUNNING() && PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_function_template)) {
                 php_v8_function_template->persistent->Reset();
             }
 

Diff for: src/php_v8_object_template.cc

@@ -71,7 +71,7 @@ static HashTable * php_v8_object_template_gc(zval *object, zval **table, int *n)
 static void php_v8_object_template_free(zend_object *object) {
     php_v8_object_template_t *php_v8_object_template = php_v8_object_template_fetch_object(object);
 
-    if (zend_is_executing() && !CG(unclean_shutdown) && php_v8_object_template->persistent_data && !php_v8_object_template->persistent_data->empty()) {
+    if (PHP_V8_IS_UP_AND_RUNNING() && php_v8_object_template->persistent_data && !php_v8_object_template->persistent_data->empty()) {
         php_v8_object_template_make_weak(php_v8_object_template);
     }
 
@@ -81,7 +81,7 @@ static void php_v8_object_template_free(zend_object *object) {
             php_v8_object_template->persistent_data = NULL;
         }
 
-        if (php_v8_object_template->persistent) {
+        if (PHP_V8_IS_UP_AND_RUNNING() && php_v8_object_template->persistent) {
             if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_object_template)) {
                 php_v8_object_template->persistent->Reset();
             }

Diff for: src/php_v8_script.cc

@@ -49,7 +49,7 @@ static void php_v8_script_free(zend_object *object)
     php_v8_script_t *php_v8_script = php_v8_script_fetch_object(object);
 
     if (php_v8_script->persistent) {
-        if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_script)) {
+        if (PHP_V8_IS_UP_AND_RUNNING() && PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_script)) {
             php_v8_script->persistent->Reset();
         }
         delete php_v8_script->persistent;

Diff for: src/php_v8_unbound_script.cc

@@ -50,7 +50,7 @@ static void php_v8_unbound_script_free(zend_object *object)
     php_v8_unbound_script_t *php_v8_unbound_script = php_v8_unbound_script_fetch_object(object);
 
     if (php_v8_unbound_script->persistent) {
-        if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_unbound_script)) {
+        if (PHP_V8_IS_UP_AND_RUNNING() && PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_unbound_script)) {
             php_v8_unbound_script->persistent->Reset();
         }
         delete php_v8_unbound_script->persistent;

Diff for: src/php_v8_value.cc

@@ -122,7 +122,7 @@ static void php_v8_value_free(zend_object *object) {
 
 
     // TODO: making weak makes sense for objects only
-    if (zend_is_executing() && !CG(unclean_shutdown) && php_v8_value->persistent_data && !php_v8_value->persistent_data->empty()) {
+    if (PHP_V8_IS_UP_AND_RUNNING() && php_v8_value->persistent_data && !php_v8_value->persistent_data->empty()) {
         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
     }
 
@@ -135,7 +135,7 @@ static void php_v8_value_free(zend_object *object) {
         }
 
         if (php_v8_value->persistent) {
-            if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_value)) {
+            if (PHP_V8_IS_UP_AND_RUNNING() && PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_value)) {
                 php_v8_value->persistent->Reset();
             }