Add zend_error_notify_callback infrastructure and call in zend_error_va_list.

Author: beberlei

Zend/zend.c

@@ -1323,6 +1323,8 @@ static ZEND_COLD void zend_error_va_list(
 	}
 #endif /* HAVE_DTRACE */
 
+	zend_error_notify_all_callbacks(type, error_filename, error_lineno, format, args);
+
 	/* if we don't have a user defined error handler */
 	if (Z_TYPE(EG(user_error_handler)) == IS_UNDEF
 		|| !(EG(user_error_handler_error_reporting) & type)
@@ -1767,3 +1769,40 @@ ZEND_API void zend_map_ptr_extend(size_t last)
 		CG(map_ptr_last) = last;
 	}
 }
+
+static void zend_error_notify_callback_dtor(zend_error_notify_callback *callback)
+{
+}
+
+int zend_startup_error_notify_callbacks()
+{
+	zend_llist_init(&zend_error_notify_callbacks, sizeof(zend_error_notify_callback), (void (*)(void *)) zend_error_notify_callback_dtor, 1);
+
+	return SUCCESS;
+}
+
+int zend_shutdown_error_notify_callbacks()
+{
+	zend_llist_destroy(&zend_error_notify_callbacks);
+
+	return SUCCESS;
+}
+
+void zend_register_error_notify_callback(const char *name, zend_error_notify_cb cb)
+{
+	zend_error_notify_callback callback;
+	callback.name = name;
+	callback.notify_callback = cb;
+
+	zend_llist_add_element(&zend_error_notify_callbacks, &callback);
+}
+
+static void zend_error_notify_single_callback(zend_error_notify_callback *callback, int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
+{
+	callback->notify_callback(type, error_filename, error_lineno, format, args);
+}
+
+void zend_error_notify_all_callbacks(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
+{
+	zend_llist_apply_with_arguments(&zend_error_notify_callbacks, (llist_apply_with_args_func_t) zend_error_notify_single_callback, 5, type, error_filename, error_lineno, format, args);
+}

Zend/zend.h

@@ -349,6 +349,19 @@ ZEND_API void zend_save_error_handling(zend_error_handling *current);
 ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current);
 ZEND_API void zend_restore_error_handling(zend_error_handling *saved);
 
+typedef void (*zend_error_notify_cb)(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
+
+typedef struct {
+	const char *name;
+	zend_error_notify_cb notify_callback;
+} zend_error_notify_callback;
+
+ZEND_API zend_llist zend_error_notify_callbacks;
+void zend_register_error_notify_callback(const char *name, zend_error_notify_cb callback);
+int zend_startup_error_notify_callbacks();
+int zend_shutdown_error_notify_callbacks();
+void zend_error_notify_all_callbacks(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
+
 #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0)
 #define DEBUG_BACKTRACE_IGNORE_ARGS    (1<<1)