Disable cloning for V8 wrapper objects

pinepain · pinepain · commit 393e6c6d0f44 · 2017-02-25T23:55:51.000+02:00
diff --git a/src/php_v8_cached_data.cc b/src/php_v8_cached_data.cc
@@ -136,8 +136,9 @@ PHP_MINIT_FUNCTION(php_v8_cached_data)
 
     memcpy(&php_v8_cached_data_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_cached_data_object_handlers.offset = XtOffsetOf(php_v8_cached_data_t, std);
-    php_v8_cached_data_object_handlers.free_obj = php_v8_cached_data_free;
+    php_v8_cached_data_object_handlers.offset    = XtOffsetOf(php_v8_cached_data_t, std);
+    php_v8_cached_data_object_handlers.free_obj  = php_v8_cached_data_free;
+    php_v8_cached_data_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_context.cc b/src/php_v8_context.cc
@@ -355,8 +355,9 @@ PHP_MINIT_FUNCTION(php_v8_context)
 
     memcpy(&php_v8_context_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_context_object_handlers.offset = XtOffsetOf(php_v8_context_t, std);
-    php_v8_context_object_handlers.free_obj = php_v8_context_free;
+    php_v8_context_object_handlers.offset    = XtOffsetOf(php_v8_context_t, std);
+    php_v8_context_object_handlers.free_obj  = php_v8_context_free;
+    php_v8_context_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_function_template.cc b/src/php_v8_function_template.cc
@@ -574,9 +574,10 @@ PHP_MINIT_FUNCTION (php_v8_function_template) {
 
     memcpy(&php_v8_function_template_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_function_template_object_handlers.offset   = XtOffsetOf(php_v8_function_template_t, std);
-    php_v8_function_template_object_handlers.free_obj = php_v8_function_template_free;
-    php_v8_function_template_object_handlers.get_gc   = php_v8_function_template_gc;
+    php_v8_function_template_object_handlers.offset    = XtOffsetOf(php_v8_function_template_t, std);
+    php_v8_function_template_object_handlers.free_obj  = php_v8_function_template_free;
+    php_v8_function_template_object_handlers.get_gc    = php_v8_function_template_gc;
+    php_v8_function_template_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_indexed_property_handler_configuration.cc b/src/php_v8_indexed_property_handler_configuration.cc
@@ -149,9 +149,10 @@ PHP_MINIT_FUNCTION(php_v8_indexed_property_handler_configuration) {
 
     memcpy(&php_v8_indexed_property_handler_configuration_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_indexed_property_handler_configuration_object_handlers.offset   = XtOffsetOf(php_v8_indexed_property_handler_configuration_t, std);
-    php_v8_indexed_property_handler_configuration_object_handlers.free_obj = php_v8_indexed_property_handler_configuration_free;
-    php_v8_indexed_property_handler_configuration_object_handlers.get_gc   = php_v8_indexed_property_handler_configuration_gc;
+    php_v8_indexed_property_handler_configuration_object_handlers.offset    = XtOffsetOf(php_v8_indexed_property_handler_configuration_t, std);
+    php_v8_indexed_property_handler_configuration_object_handlers.free_obj  = php_v8_indexed_property_handler_configuration_free;
+    php_v8_indexed_property_handler_configuration_object_handlers.get_gc    = php_v8_indexed_property_handler_configuration_gc;
+    php_v8_indexed_property_handler_configuration_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_isolate.cc b/src/php_v8_isolate.cc
@@ -646,9 +646,10 @@ PHP_MINIT_FUNCTION (php_v8_isolate) {
 
     memcpy(&php_v8_isolate_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_isolate_object_handlers.offset   = XtOffsetOf(php_v8_isolate_t, std);
-    php_v8_isolate_object_handlers.free_obj = php_v8_isolate_free;
-    php_v8_isolate_object_handlers.get_gc   = php_v8_isolate_gc;
+    php_v8_isolate_object_handlers.offset    = XtOffsetOf(php_v8_isolate_t, std);
+    php_v8_isolate_object_handlers.free_obj  = php_v8_isolate_free;
+    php_v8_isolate_object_handlers.get_gc    = php_v8_isolate_gc;
+    php_v8_isolate_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_named_property_handler_configuration.cc b/src/php_v8_named_property_handler_configuration.cc
@@ -148,9 +148,10 @@ PHP_MINIT_FUNCTION(php_v8_named_property_handler_configuration) {
 
     memcpy(&php_v8_named_property_handler_configuration_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_named_property_handler_configuration_object_handlers.offset   = XtOffsetOf(php_v8_named_property_handler_configuration_t, std);
-    php_v8_named_property_handler_configuration_object_handlers.free_obj = php_v8_named_property_handler_configuration_free;
-    php_v8_named_property_handler_configuration_object_handlers.get_gc   = php_v8_named_property_handler_configuration_gc;
+    php_v8_named_property_handler_configuration_object_handlers.offset    = XtOffsetOf(php_v8_named_property_handler_configuration_t, std);
+    php_v8_named_property_handler_configuration_object_handlers.free_obj  = php_v8_named_property_handler_configuration_free;
+    php_v8_named_property_handler_configuration_object_handlers.get_gc    = php_v8_named_property_handler_configuration_gc;
+    php_v8_named_property_handler_configuration_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_object_template.cc b/src/php_v8_object_template.cc
@@ -531,9 +531,10 @@ PHP_MINIT_FUNCTION (php_v8_object_template) {
 
     memcpy(&php_v8_object_template_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_object_template_object_handlers.offset   = XtOffsetOf(php_v8_object_template_t, std);
-    php_v8_object_template_object_handlers.free_obj = php_v8_object_template_free;
-    php_v8_object_template_object_handlers.get_gc   = php_v8_object_template_gc;
+    php_v8_object_template_object_handlers.offset    = XtOffsetOf(php_v8_object_template_t, std);
+    php_v8_object_template_object_handlers.free_obj  = php_v8_object_template_free;
+    php_v8_object_template_object_handlers.get_gc    = php_v8_object_template_gc;
+    php_v8_object_template_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_return_value.cc b/src/php_v8_return_value.cc
@@ -420,8 +420,9 @@ PHP_MINIT_FUNCTION (php_v8_return_value) {
 
     memcpy(&php_v8_return_value_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_return_value_object_handlers.offset   = XtOffsetOf(php_v8_return_value_t, std);
-    php_v8_return_value_object_handlers.free_obj = php_v8_return_value_free;
+    php_v8_return_value_object_handlers.offset    = XtOffsetOf(php_v8_return_value_t, std);
+    php_v8_return_value_object_handlers.free_obj  = php_v8_return_value_free;
+    php_v8_return_value_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_script.cc b/src/php_v8_script.cc
@@ -249,8 +249,9 @@ PHP_MINIT_FUNCTION(php_v8_script)
 
     memcpy(&php_v8_script_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_script_object_handlers.offset = XtOffsetOf(php_v8_script_t, std);
-    php_v8_script_object_handlers.free_obj = php_v8_script_free;
+    php_v8_script_object_handlers.offset    = XtOffsetOf(php_v8_script_t, std);
+    php_v8_script_object_handlers.free_obj  = php_v8_script_free;
+    php_v8_script_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_startup_data.cc b/src/php_v8_startup_data.cc
@@ -169,8 +169,9 @@ PHP_MINIT_FUNCTION (php_v8_startup_data) {
 
     memcpy(&php_v8_startup_data_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_startup_data_object_handlers.offset   = XtOffsetOf(php_v8_startup_data_t, std);
-    php_v8_startup_data_object_handlers.free_obj = php_v8_startup_data_free;
+    php_v8_startup_data_object_handlers.offset    = XtOffsetOf(php_v8_startup_data_t, std);
+    php_v8_startup_data_object_handlers.free_obj  = php_v8_startup_data_free;
+    php_v8_startup_data_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_template.cc b/src/php_v8_template.cc
@@ -306,7 +306,6 @@ PHP_MINIT_FUNCTION (php_v8_template) {
     zend_class_entry ce;
 
     INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "Template", php_v8_template_methods);
-    //zend_class_implements()
     this_ce = zend_register_internal_class_ex(&ce, php_v8_data_class_entry);
 
     zend_declare_property_null(this_ce, ZEND_STRL("isolate"), ZEND_ACC_PRIVATE);
diff --git a/src/php_v8_unbound_script.cc b/src/php_v8_unbound_script.cc
@@ -248,8 +248,9 @@ PHP_MINIT_FUNCTION(php_v8_unbound_script)
 
     memcpy(&php_v8_unbound_script_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_unbound_script_object_handlers.offset = XtOffsetOf(php_v8_unbound_script_t, std);
-    php_v8_unbound_script_object_handlers.free_obj = php_v8_unbound_script_free;
+    php_v8_unbound_script_object_handlers.offset    = XtOffsetOf(php_v8_unbound_script_t, std);
+    php_v8_unbound_script_object_handlers.free_obj  = php_v8_unbound_script_free;
+    php_v8_unbound_script_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }
diff --git a/src/php_v8_value.cc b/src/php_v8_value.cc
@@ -1123,9 +1123,10 @@ PHP_MINIT_FUNCTION (php_v8_value) {
 
     memcpy(&php_v8_value_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_v8_value_object_handlers.offset   = XtOffsetOf(php_v8_value_t, std);
-    php_v8_value_object_handlers.free_obj = php_v8_value_free;
-    php_v8_value_object_handlers.get_gc   = php_v8_value_gc;
+    php_v8_value_object_handlers.offset    = XtOffsetOf(php_v8_value_t, std);
+    php_v8_value_object_handlers.free_obj  = php_v8_value_free;
+    php_v8_value_object_handlers.get_gc    = php_v8_value_gc;
+    php_v8_value_object_handlers.clone_obj = NULL;
 
     return SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,9 @@ PHP_MINIT_FUNCTION(php_v8_cached_data)`
`136`	`136`
`137`	`137`	`memcpy(&php_v8_cached_data_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));`
`138`	`138`
`139`		`- php_v8_cached_data_object_handlers.offset = XtOffsetOf(php_v8_cached_data_t, std);`
`140`		`- php_v8_cached_data_object_handlers.free_obj = php_v8_cached_data_free;`
	`139`	`+ php_v8_cached_data_object_handlers.offset = XtOffsetOf(php_v8_cached_data_t, std);`
	`140`	`+ php_v8_cached_data_object_handlers.free_obj = php_v8_cached_data_free;`
	`141`	`+ php_v8_cached_data_object_handlers.clone_obj = NULL;`
`141`	`142`
`142`	`143`	`return SUCCESS;`
`143`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -355,8 +355,9 @@ PHP_MINIT_FUNCTION(php_v8_context)`
`355`	`355`
`356`	`356`	`memcpy(&php_v8_context_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));`
`357`	`357`
`358`		`- php_v8_context_object_handlers.offset = XtOffsetOf(php_v8_context_t, std);`
`359`		`- php_v8_context_object_handlers.free_obj = php_v8_context_free;`
	`358`	`+ php_v8_context_object_handlers.offset = XtOffsetOf(php_v8_context_t, std);`
	`359`	`+ php_v8_context_object_handlers.free_obj = php_v8_context_free;`
	`360`	`+ php_v8_context_object_handlers.clone_obj = NULL;`
`360`	`361`
`361`	`362`	`return SUCCESS;`
`362`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -420,8 +420,9 @@ PHP_MINIT_FUNCTION (php_v8_return_value) {`
`420`	`420`
`421`	`421`	`memcpy(&php_v8_return_value_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));`
`422`	`422`
`423`		`- php_v8_return_value_object_handlers.offset = XtOffsetOf(php_v8_return_value_t, std);`
`424`		`- php_v8_return_value_object_handlers.free_obj = php_v8_return_value_free;`
	`423`	`+ php_v8_return_value_object_handlers.offset = XtOffsetOf(php_v8_return_value_t, std);`
	`424`	`+ php_v8_return_value_object_handlers.free_obj = php_v8_return_value_free;`
	`425`	`+ php_v8_return_value_object_handlers.clone_obj = NULL;`
`425`	`426`
`426`	`427`	`return SUCCESS;`
`427`	`428`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,9 @@ PHP_MINIT_FUNCTION(php_v8_script)`
`249`	`249`
`250`	`250`	`memcpy(&php_v8_script_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));`
`251`	`251`
`252`		`- php_v8_script_object_handlers.offset = XtOffsetOf(php_v8_script_t, std);`
`253`		`- php_v8_script_object_handlers.free_obj = php_v8_script_free;`
	`252`	`+ php_v8_script_object_handlers.offset = XtOffsetOf(php_v8_script_t, std);`
	`253`	`+ php_v8_script_object_handlers.free_obj = php_v8_script_free;`
	`254`	`+ php_v8_script_object_handlers.clone_obj = NULL;`
`254`	`255`
`255`	`256`	`return SUCCESS;`
`256`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,9 @@ PHP_MINIT_FUNCTION (php_v8_startup_data) {`
`169`	`169`
`170`	`170`	`memcpy(&php_v8_startup_data_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));`
`171`	`171`
`172`		`- php_v8_startup_data_object_handlers.offset = XtOffsetOf(php_v8_startup_data_t, std);`
`173`		`- php_v8_startup_data_object_handlers.free_obj = php_v8_startup_data_free;`
	`172`	`+ php_v8_startup_data_object_handlers.offset = XtOffsetOf(php_v8_startup_data_t, std);`
	`173`	`+ php_v8_startup_data_object_handlers.free_obj = php_v8_startup_data_free;`
	`174`	`+ php_v8_startup_data_object_handlers.clone_obj = NULL;`
`174`	`175`
`175`	`176`	`return SUCCESS;`
`176`	`177`	`}`