Fixed issue #546 (Segfault due to get_gc handler changed)

laruence · Jun 30, 2021 · 14c17d9 · 14c17d9
1 parent 3e67304
commit 14c17d9
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 12 deletions.
diff --git a/php_yaf.h b/php_yaf.h
@@ -70,9 +70,11 @@ extern zend_module_entry yaf_module_entry;
 # define GC_ADDREF(gc)           (++GC_REFCOUNT(gc))
 # define GC_DELREF(gc)           (--GC_REFCOUNT(gc))
 # endif
+# define yaf_fake_get_gc        NULL
 #else
 #define YAF_WRITE_HANDLER       zval *
 #define YAF_WHANDLER_RET(zv)    return zv
+HashTable *yaf_fake_get_gc(zend_object *zobj, zval **table, int *n);
 #endif
 
 #if PHP_VERSION_ID < 80000

diff --git a/routes/yaf_route_map.c b/routes/yaf_route_map.c
@@ -372,7 +372,7 @@ YAF_STARTUP_FUNCTION(route_map) {
 	memcpy(&yaf_route_map_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_route_map_obj_handlers.free_obj = yaf_route_map_object_free;
 	yaf_route_map_obj_handlers.clone_obj = NULL;
-	yaf_route_map_obj_handlers.get_gc = NULL;
+	yaf_route_map_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_route_map_obj_handlers.get_properties = yaf_route_map_get_properties;
 
 

diff --git a/routes/yaf_route_regex.c b/routes/yaf_route_regex.c
@@ -474,7 +474,7 @@ YAF_STARTUP_FUNCTION(route_regex) {
 
 	memcpy(&yaf_route_regex_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_route_regex_obj_handlers.free_obj = yaf_route_regex_object_free;
-	yaf_route_regex_obj_handlers.get_gc = NULL;
+	yaf_route_regex_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_route_regex_obj_handlers.clone_obj = NULL;
 	yaf_route_regex_obj_handlers.get_properties = yaf_route_regex_get_properties;
 

diff --git a/routes/yaf_route_rewrite.c b/routes/yaf_route_rewrite.c
@@ -499,7 +499,7 @@ YAF_STARTUP_FUNCTION(route_rewrite) {
 	memcpy(&yaf_route_rewrite_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_route_rewrite_obj_handlers.free_obj = yaf_route_rewrite_object_free;
 	yaf_route_rewrite_obj_handlers.clone_obj = NULL;
-	yaf_route_rewrite_obj_handlers.get_gc = NULL;
+	yaf_route_rewrite_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_route_rewrite_obj_handlers.get_properties = yaf_route_rewrite_get_properties;
 
 	return SUCCESS;

diff --git a/routes/yaf_route_simple.c b/routes/yaf_route_simple.c
@@ -284,7 +284,7 @@ YAF_STARTUP_FUNCTION(route_simple) {
 	memcpy(&yaf_route_simple_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_route_simple_obj_handlers.free_obj = yaf_route_simple_object_free;
 	yaf_route_simple_obj_handlers.clone_obj = NULL;
-	yaf_route_simple_obj_handlers.get_gc = NULL;
+	yaf_route_simple_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_route_simple_obj_handlers.get_properties = yaf_route_simple_get_properties;
 
 	return SUCCESS;

diff --git a/routes/yaf_route_supervar.c b/routes/yaf_route_supervar.c
@@ -245,7 +245,7 @@ YAF_STARTUP_FUNCTION(route_supervar) {
 	memcpy(&yaf_route_supervar_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_route_supervar_obj_handlers.free_obj = yaf_route_supervar_object_free;
 	yaf_route_supervar_obj_handlers.clone_obj = NULL;
-	yaf_route_supervar_obj_handlers.get_gc = NULL;
+	yaf_route_supervar_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_route_supervar_obj_handlers.get_properties = yaf_route_supervar_get_properties;
 
 

diff --git a/views/yaf_view_simple.c b/views/yaf_view_simple.c
@@ -685,7 +685,7 @@ YAF_STARTUP_FUNCTION(view_simple) {
 	yaf_view_simple_obj_handlers.read_property = (zend_object_read_property_t)yaf_view_simple_read_property;
 	yaf_view_simple_obj_handlers.write_property = (zend_object_write_property_t)yaf_view_simple_write_property;
 	yaf_view_simple_obj_handlers.clone_obj = NULL;
-	yaf_view_simple_obj_handlers.get_gc = NULL;
+	yaf_view_simple_obj_handlers.get_gc = yaf_fake_get_gc;
 
 
 	return SUCCESS;

diff --git a/yaf.c b/yaf.c
@@ -71,6 +71,15 @@ void yaf_iterator_dtor(zend_object_iterator *iter) /* {{{ */ {
 }
 /* }}} */
 
+#if PHP_VERSION_ID >= 70400
+HashTable *yaf_fake_get_gc(zend_object *zobj, zval **table, int *n) /* {{{ */ {
+	*n = 0;
+	*table = NULL;
+	return NULL;
+}
+/* }}} */
+#endif
+
 static int yaf_iterator_valid(zend_object_iterator *iter) /* {{{ */ {
 	return zend_hash_has_more_elements_ex(Z_ARRVAL(iter->data), &(((yaf_iterator*)iter)->pos));
 }

diff --git a/yaf_controller.c b/yaf_controller.c
@@ -854,7 +854,7 @@ YAF_STARTUP_FUNCTION(controller) {
 	memcpy(&yaf_controller_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_controller_obj_handlers.offset = XtOffsetOf(yaf_controller_object, std);
 	yaf_controller_obj_handlers.clone_obj = NULL;
-	yaf_controller_obj_handlers.get_gc = NULL;
+	yaf_controller_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_controller_obj_handlers.free_obj = yaf_controller_object_free;
 	yaf_controller_obj_handlers.get_properties = yaf_controller_get_properties;
 	yaf_controller_obj_handlers.read_property = (zend_object_read_property_t)yaf_controller_read_property;

diff --git a/yaf_loader.c b/yaf_loader.c
@@ -1000,7 +1000,7 @@ YAF_STARTUP_FUNCTION(loader) {
 
 	memcpy(&yaf_loader_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_loader_obj_handlers.clone_obj = NULL;
-	yaf_loader_obj_handlers.get_gc = NULL;
+	yaf_loader_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_loader_obj_handlers.free_obj = yaf_loader_obj_free;
 	yaf_loader_obj_handlers.get_properties = yaf_loader_get_properties;
 

diff --git a/yaf_registry.c b/yaf_registry.c
@@ -240,7 +240,7 @@ YAF_STARTUP_FUNCTION(registry) {
 	memcpy(&yaf_registry_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_registry_obj_handlers.offset = XtOffsetOf(yaf_registry_object, std);
 	yaf_registry_obj_handlers.clone_obj = NULL;
-	yaf_registry_obj_handlers.get_gc = NULL;
+	yaf_registry_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_registry_obj_handlers.free_obj = yaf_registry_object_free;
 	yaf_registry_obj_handlers.get_properties = yaf_registry_get_properties;
 

diff --git a/yaf_response.c b/yaf_response.c
@@ -587,7 +587,7 @@ YAF_STARTUP_FUNCTION(response) {
 	yaf_response_obj_handlers.offset = XtOffsetOf(yaf_response_object, std);
 	yaf_response_obj_handlers.free_obj = yaf_response_object_free;
 	yaf_response_obj_handlers.clone_obj = NULL;
-	yaf_response_obj_handlers.get_gc = NULL;
+	yaf_response_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_response_obj_handlers.get_properties = yaf_response_get_properties;
 	yaf_response_obj_handlers.read_property = (zend_object_read_property_t)yaf_response_read_property;
 	yaf_response_obj_handlers.write_property = (zend_object_write_property_t)yaf_response_write_property;

diff --git a/yaf_router.c b/yaf_router.c
@@ -432,7 +432,7 @@ YAF_STARTUP_FUNCTION(router) {
 	memcpy(&yaf_router_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	yaf_router_obj_handlers.offset = XtOffsetOf(yaf_router_object, std);
 	yaf_router_obj_handlers.clone_obj = NULL;
-	yaf_router_obj_handlers.get_gc = NULL;
+	yaf_router_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_router_obj_handlers.free_obj = yaf_router_object_free;
 	yaf_router_obj_handlers.get_properties = yaf_router_get_properties;
 

diff --git a/yaf_session.c b/yaf_session.c
@@ -350,7 +350,7 @@ YAF_STARTUP_FUNCTION(session) {
 	yaf_session_obj_handlers.offset = XtOffsetOf(yaf_session_object, std);
 	yaf_session_obj_handlers.free_obj = yaf_session_object_free;
 	yaf_session_obj_handlers.clone_obj = NULL;
-	yaf_session_obj_handlers.get_gc = NULL;
+	yaf_session_obj_handlers.get_gc = yaf_fake_get_gc;
 	yaf_session_obj_handlers.get_properties = yaf_session_get_properties;
 
 #if defined(HAVE_SPL) && PHP_VERSION_ID < 70200