Suggested changes by joe.

Author: beberlei

Zend/zend.c

@@ -60,6 +60,8 @@ ZEND_TSRMLS_CACHE_DEFINE()
 ZEND_API zend_utility_values zend_uv;
 ZEND_API zend_bool zend_dtrace_enabled;
 
+zend_llist zend_error_notify_callbacks;
+
 /* version information */
 static char *zend_version_info;
 static uint32_t zend_version_info_length;
@@ -1767,6 +1769,7 @@ ZEND_API void zend_map_ptr_extend(size_t last)
 
 static void zend_error_notify_callback_dtor(zend_error_notify_callback *callback)
 {
+	free(callback->name);
 }
 
 int zend_startup_error_notify_callbacks()
@@ -1783,11 +1786,18 @@ int zend_shutdown_error_notify_callbacks()
 	return SUCCESS;
 }
 
+void zend_error_notify_callbacks_apply(llist_apply_func_t *callback)
+{
+	zend_llist_apply(&zend_error_notify_callbacks, callback);
+}
+
 void zend_register_error_notify_callback(const char *name, zend_error_notify_cb cb)
 {
+	ZEND_ASSERT(name != NULL);
+
 	zend_error_notify_callback callback;
 
-	callback.name = name;
+	callback.name = strdup(name);
 	callback.notify_callback = cb;
 
 	zend_llist_add_element(&zend_error_notify_callbacks, &callback);

Zend/zend.h

@@ -351,16 +351,18 @@ 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);
 
+BEGIN_EXTERN_C()
 typedef struct {
-	const char *name;
+	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);
+void zend_error_notify_callbacks_apply(llist_apply_func_t *callback);
+END_EXTERN_C()
 
 #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0)
 #define DEBUG_BACKTRACE_IGNORE_ARGS    (1<<1)

ext/standard/info.c

@@ -100,7 +100,7 @@ static ZEND_COLD void php_info_print_error_notify_callbacks() /* {{{ */
 		php_info_printf("\nRegistered Error Notification Callbacks => ");
 	}
 
-	zend_llist_apply(&zend_error_notify_callbacks, (llist_apply_func_t) php_info_print_error_notify_callback);
+	zend_error_notify_callbacks_apply((llist_apply_func_t) php_info_print_error_notify_callback);
 
 	if (!sapi_module.phpinfo_as_text) {
 		php_info_print("</td></tr>\n");