Ensure that statically stored class entries have an header

Author: arnaud-lb

Zend/zend.h

@@ -253,6 +253,10 @@ struct _zend_class_entry {
 	} info;
 };
 
+typedef char zend_class_entry_storage[ZEND_CLASS_ENTRY_HEADER_SIZE + sizeof(zend_class_entry)];
+
+#define ZEND_CES_TO_CE(ces) ((zend_class_entry*)((char*) (ces) + ZEND_CLASS_ENTRY_HEADER_SIZE))
+
 typedef struct _zend_utility_functions {
 	void (*error_function)(int type, zend_string *error_filename, const uint32_t error_lineno, zend_string *message);
 	size_t (*printf_function)(const char *format, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);

Zend/zend_API.c

@@ -3359,7 +3359,7 @@ ZEND_API int zend_next_free_module(void) /* {{{ */
 
 static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class_entry, uint32_t ce_flags) /* {{{ */
 {
-	void *ref = malloc(sizeof(zend_class_entry) + ZEND_CLASS_ENTRY_HEADER_SIZE);
+	zend_class_entry_storage *ref = (zend_class_entry_storage*) malloc(sizeof(zend_class_entry) + ZEND_CLASS_ENTRY_HEADER_SIZE);
 	zend_class_entry *class_entry = zend_init_class_entry_header(ref);
 	zend_string *lowercase_name;
 	*class_entry = *orig_class_entry;

Zend/zend_compile.c

@@ -8270,8 +8270,8 @@ static void zend_compile_generic_params(zend_ast *params_ast)
 	}
 }
 
-zend_class_entry *zend_init_class_entry_header(void *ptr) {
-	zend_class_reference *ref = ptr;
+zend_class_entry *zend_init_class_entry_header(zend_class_entry_storage *ptr) {
+	zend_class_reference *ref = (zend_class_reference*) ptr;
 	zend_class_entry *ce = (zend_class_entry *) ((char *) ptr + ZEND_CLASS_ENTRY_HEADER_SIZE);
 	ref->ce = ce;
 	ref->args.num_types = 0;

Zend/zend_compile.h

@@ -909,7 +909,7 @@ ZEND_API void pass_two(zend_op_array *op_array);
 ZEND_API bool zend_is_compiling(void);
 ZEND_API char *zend_make_compiled_string_description(const char *name);
 ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_handlers);
-zend_class_entry *zend_init_class_entry_header(void *ptr);
+zend_class_entry *zend_init_class_entry_header(zend_class_entry_storage *ptr);
 uint32_t zend_get_class_fetch_type(const zend_string *name);
 ZEND_API uint8_t zend_get_call_op(const zend_op *init_op, zend_function *fbc);
 ZEND_API bool zend_is_smart_branch(const zend_op *opline);

Zend/zend_exceptions.c

@@ -45,10 +45,12 @@ ZEND_API zend_class_entry *zend_ce_division_by_zero_error;
 ZEND_API zend_class_entry *zend_ce_unhandled_match_error;
 
 /* Internal pseudo-exception that is not exposed to userland. Throwing this exception *does not* execute finally blocks. */
-static zend_class_entry zend_ce_unwind_exit;
+static zend_class_entry_storage zend_ces_unwind_exit;
+#define zend_ce_unwind_exit ZEND_CES_TO_CE(zend_ces_unwind_exit)
 
 /* Internal pseudo-exception that is not exposed to userland. Throwing this exception *does* execute finally blocks. */
-static zend_class_entry zend_ce_graceful_exit;
+static zend_class_entry_storage zend_ces_graceful_exit;
+#define zend_ce_graceful_exit ZEND_CES_TO_CE(zend_ces_graceful_exit)
 
 ZEND_API void (*zend_throw_exception_hook)(zend_object *ex);
 
@@ -795,9 +797,11 @@ void zend_register_default_exception(void) /* {{{ */
 	zend_ce_unhandled_match_error = register_class_UnhandledMatchError(zend_ce_error);
 	zend_init_exception_class_entry(zend_ce_unhandled_match_error);
 
-	INIT_CLASS_ENTRY(zend_ce_unwind_exit, "UnwindExit", NULL);
+	INIT_CLASS_ENTRY((*zend_ce_unwind_exit), "UnwindExit", NULL);
+	zend_init_class_entry_header(&zend_ces_unwind_exit);
 
-	INIT_CLASS_ENTRY(zend_ce_graceful_exit, "GracefulExit", NULL);
+	INIT_CLASS_ENTRY((*zend_ce_graceful_exit), "GracefulExit", NULL);
+	zend_init_class_entry_header(&zend_ces_graceful_exit);
 }
 /* }}} */
 
@@ -958,7 +962,7 @@ ZEND_API ZEND_COLD zend_result zend_exception_error(zend_object *ex, int severit
 
 		zend_string_release_ex(str, 0);
 		zend_string_release_ex(file, 0);
-	} else if (ce_exception == &zend_ce_unwind_exit || ce_exception == &zend_ce_graceful_exit) {
+	} else if (ce_exception == zend_ce_unwind_exit || ce_exception == zend_ce_graceful_exit) {
 		/* We successfully unwound, nothing more to do.
 		 * We still return FAILURE in this case, as further execution should still be aborted. */
 	} else {
@@ -1006,12 +1010,12 @@ ZEND_API ZEND_COLD void zend_throw_exception_object(zval *exception) /* {{{ */
 
 ZEND_API ZEND_COLD zend_object *zend_create_unwind_exit(void)
 {
-	return zend_objects_new(&zend_ce_unwind_exit);
+	return zend_objects_new(zend_ce_unwind_exit);
 }
 
 ZEND_API ZEND_COLD zend_object *zend_create_graceful_exit(void)
 {
-	return zend_objects_new(&zend_ce_graceful_exit);
+	return zend_objects_new(zend_ce_graceful_exit);
 }
 
 ZEND_API ZEND_COLD void zend_throw_unwind_exit(void)
@@ -1032,10 +1036,10 @@ ZEND_API ZEND_COLD void zend_throw_graceful_exit(void)
 
 ZEND_API bool zend_is_unwind_exit(const zend_object *ex)
 {
-	return OBJ_CE(ex) == &zend_ce_unwind_exit;
+	return ex->cr == (zend_class_reference*) &zend_ces_unwind_exit;
 }
 
 ZEND_API bool zend_is_graceful_exit(const zend_object *ex)
 {
-	return OBJ_CE(ex) == &zend_ce_graceful_exit;
+	return ex->cr == (zend_class_reference*) &zend_ces_graceful_exit;
 }

Zend/zend_iterators.c

@@ -20,7 +20,8 @@
 #include "zend.h"
 #include "zend_API.h"
 
-static zend_class_entry zend_iterator_class_entry;
+static zend_class_entry_storage zend_iterator_class_entry_storage;
+#define zend_iterator_class_entry ZEND_CES_TO_CE(&zend_iterator_class_entry_storage)
 
 static void iter_wrapper_free(zend_object *object);
 static void iter_wrapper_dtor(zend_object *object);
@@ -56,8 +57,9 @@ static const zend_object_handlers iterator_object_handlers = {
 
 ZEND_API void zend_register_iterator_wrapper(void)
 {
-	INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL);
-	zend_iterator_class_entry.default_object_handlers = &iterator_object_handlers;
+	INIT_CLASS_ENTRY((*zend_iterator_class_entry), "__iterator_wrapper", NULL);
+	zend_iterator_class_entry->default_object_handlers = &iterator_object_handlers;
+	zend_init_class_entry_header(&zend_iterator_class_entry_storage);
 }
 
 static void iter_wrapper_free(zend_object *object)
@@ -83,7 +85,7 @@ static HashTable *iter_wrapper_get_gc(zend_object *object, zval **table, int *n)
 
 ZEND_API void zend_iterator_init(zend_object_iterator *iter)
 {
-	zend_object_std_init(&iter->std, &zend_iterator_class_entry);
+	zend_object_std_init(&iter->std, zend_iterator_class_entry);
 }
 
 ZEND_API void zend_iterator_dtor(zend_object_iterator *iter)