Commit 7a9420480dd for php
commit 7a9420480dd1ced944c333daa6aa387a3a1d0166
Merge: d54a5ddb7fa e3a115311d4
Author: David Carlier <devnexen@gmail.com>
Date: Wed Nov 11 05:27:33 2026 +0000
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
ext/gd: keep the brush and tile images alive while the destination uses them
diff --cc ext/gd/gd.c
index e873ecbe07e,bf14f3cdc5e..0532b890c43
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -196,9 -223,10 +213,10 @@@ static void php_gd_object_minit_helper(
memcpy(&php_gd_image_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
php_gd_image_object_handlers.clone_obj = NULL;
php_gd_image_object_handlers.free_obj = php_gd_image_object_free;
+ php_gd_image_object_handlers.get_gc = php_gd_image_object_get_gc;
php_gd_image_object_handlers.get_constructor = php_gd_image_object_get_constructor;
php_gd_image_object_handlers.compare = zend_objects_not_comparable;
- php_gd_image_object_handlers.offset = XtOffsetOf(php_gd_image_object, std);
+ php_gd_image_object_handlers.offset = offsetof(php_gd_image_object, std);
}
static zend_class_entry *gd_font_ce = NULL;