@@ -1286,7 +1286,7 @@ PHPAPI void php_html_puts(const char *str, size_t size)
12861286}
12871287/* }}} */
12881288
1289- static void clear_last_error ( void ) {
1289+ PHPAPI void php_clear_last_error ( bool clear_repeated_errors ) {
12901290 if (PG (last_error_message )) {
12911291 zend_string_release (PG (last_error_message ));
12921292 PG (last_error_message ) = NULL ;
@@ -1295,6 +1295,14 @@ static void clear_last_error(void) {
12951295 zend_string_release (PG (last_error_file ));
12961296 PG (last_error_file ) = NULL ;
12971297 }
1298+ if (clear_repeated_errors ) {
1299+ if (PG (repeated_error_message )) {
1300+ zend_string_release (PG (repeated_error_message ));
1301+ PG (repeated_error_message ) = NULL ;
1302+ zend_string_release (PG (repeated_error_file ));
1303+ PG (repeated_error_file ) = NULL ;
1304+ }
1305+ }
12981306}
12991307
13001308#if ZEND_DEBUG
@@ -1329,15 +1337,14 @@ static ZEND_COLD void php_error_cb(int orig_type, zend_string *error_filename, c
13291337 bool display ;
13301338 int type = orig_type & E_ALL ;
13311339 zend_string * backtrace = ZSTR_EMPTY_ALLOC ();
1340+ zend_string * repeated_error_file = error_filename ? error_filename : ZSTR_KNOWN (ZEND_STR_UNKNOWN_CAPITALIZED );
13321341
13331342 /* check for repeated errors to be ignored */
1334- if (PG (ignore_repeated_errors ) && PG (last_error_message )) {
1335- /* no check for PG(last_error_file) is needed since it cannot
1336- * be NULL if PG(last_error_message) is not NULL */
1337- if (!zend_string_equals (PG (last_error_message ), message )
1343+ if (PG (ignore_repeated_errors ) && PG (repeated_error_message )) {
1344+ if (!zend_string_equals (PG (repeated_error_message ), message )
13381345 || (!PG (ignore_repeated_source )
1339- && ((PG (last_error_lineno ) != error_lineno )
1340- || !zend_string_equals (PG (last_error_file ), error_filename )))) {
1346+ && ((PG (repeated_error_lineno ) != error_lineno )
1347+ || !zend_string_equals (PG (repeated_error_file ), repeated_error_file )))) {
13411348 display = 1 ;
13421349 } else {
13431350 display = 0 ;
@@ -1372,18 +1379,34 @@ static ZEND_COLD void php_error_cb(int orig_type, zend_string *error_filename, c
13721379 backtrace = zend_trace_to_string (Z_ARRVAL (EG (last_fatal_error_backtrace )), /* include_main */ true);
13731380 }
13741381
1375- /* store the error if it has changed */
1376- if (display ) {
1377- clear_last_error ();
1382+ /* A suppressed repeat may replace an intervening filtered error, but must
1383+ * use the same source comparison as repeat suppression. */
1384+ if (display || !PG (last_error_message )
1385+ || !zend_string_equals (PG (last_error_message ), message )
1386+ || (!PG (ignore_repeated_source )
1387+ && (PG (last_error_lineno ) != error_lineno
1388+ || !zend_string_equals (PG (last_error_file ), repeated_error_file )))) {
1389+ php_clear_last_error (false);
13781390 if (!error_filename ) {
1379- error_filename = ZSTR_KNOWN ( ZEND_STR_UNKNOWN_CAPITALIZED ) ;
1391+ error_filename = repeated_error_file ;
13801392 }
13811393 PG (last_error_type ) = type ;
13821394 PG (last_error_message ) = zend_string_copy (message );
13831395 PG (last_error_file ) = zend_string_copy (error_filename );
13841396 PG (last_error_lineno ) = error_lineno ;
13851397 }
13861398
1399+ if ((!PG (ignore_repeated_errors ) || display )
1400+ && ((EG (error_reporting ) & type ) || (type & E_CORE ))) {
1401+ if (PG (repeated_error_message )) {
1402+ zend_string_release (PG (repeated_error_message ));
1403+ zend_string_release (PG (repeated_error_file ));
1404+ }
1405+ PG (repeated_error_lineno ) = error_lineno ;
1406+ PG (repeated_error_message ) = zend_string_copy (message );
1407+ PG (repeated_error_file ) = zend_string_copy (repeated_error_file );
1408+ }
1409+
13871410 /* Discarding the output buffers frees every handler on the stack, which is
13881411 * not safe while one of them is running */
13891412 if (zend_alloc_in_memory_limit_error_reporting ()
@@ -1708,7 +1731,7 @@ static zval *php_get_configuration_directive_for_zend(zend_string *name)
17081731/* {{{ php_free_request_globals */
17091732static void php_free_request_globals (void )
17101733{
1711- clear_last_error ( );
1734+ php_clear_last_error (true );
17121735 if (PG (php_sys_temp_dir )) {
17131736 efree (PG (php_sys_temp_dir ));
17141737 PG (php_sys_temp_dir ) = NULL ;
@@ -2039,7 +2062,7 @@ void php_request_shutdown(void *dummy)
20392062 /* 16. Free Willy (here be crashes) */
20402063 zend_arena_destroy (CG (arena ));
20412064 zend_interned_strings_deactivate ();
2042- clear_last_error ( );
2065+ php_clear_last_error (true );
20432066 zend_try {
20442067 shutdown_memory_manager (CG (unclean_shutdown ) || !report_memleaks , 0 );
20452068 } zend_end_try ();
@@ -2456,7 +2479,7 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
24562479 module_startup = false;
24572480
24582481 /* Don't leak errors from startup into the per-request phase. */
2459- clear_last_error ( );
2482+ php_clear_last_error (true );
24602483 shutdown_memory_manager (1 , 0 );
24612484 virtual_cwd_activate ();
24622485
@@ -2519,7 +2542,7 @@ void php_module_shutdown(void)
25192542
25202543 /* close down the ini config */
25212544 php_shutdown_config ();
2522- clear_last_error ( );
2545+ php_clear_last_error (true );
25232546
25242547#ifndef ZTS
25252548 zend_ini_shutdown ();
0 commit comments