Skip to content

Commit c5d5dec

Browse files
committed
Fix repeated error suppression across error types
Honor ignore_repeated_source when deciding whether a suppressed repeat replaces error_get_last(), matching the repeat-suppression comparison. Keep restoring the last error after an intervening filtered diagnostic. Add coverage for different lines and files, filtered errors, error_clear_last(), and enabling source comparison again. Fixes #19509.
1 parent 39fa31b commit c5d5dec

7 files changed

Lines changed: 177 additions & 27 deletions
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
--TEST--
2+
Test ignore_repeated_errors with error_clear_last() and error_get_last()
3+
--INI--
4+
ignore_repeated_errors=1
5+
error_reporting=-1
6+
html_errors=0
7+
--FILE--
8+
<?php
9+
function warningA() {
10+
trigger_error('A', E_USER_WARNING);
11+
}
12+
function noticeN() {
13+
trigger_error('N', E_USER_NOTICE);
14+
}
15+
16+
warningA();
17+
error_clear_last();
18+
warningA();
19+
var_dump(error_get_last()['message']);
20+
21+
error_reporting(E_ALL & ~E_USER_DEPRECATED);
22+
warningA();
23+
trigger_error('D', E_USER_DEPRECATED);
24+
warningA();
25+
var_dump(error_get_last()['message']);
26+
27+
error_clear_last();
28+
warningA();
29+
noticeN();
30+
warningA();
31+
?>
32+
--EXPECTF--
33+
Warning: A in %s on line %d
34+
35+
Warning: A in %s on line %d
36+
string(1) "A"
37+
string(1) "A"
38+
39+
Warning: A in %s on line %d
40+
41+
Notice: N in %s on line %d
42+
43+
Warning: A in %s on line %d
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--TEST--
2+
Test ignore_repeated_errors with interleaved error types
3+
--INI--
4+
ignore_repeated_errors=1
5+
error_reporting=-1
6+
--FILE--
7+
<?php
8+
for ($i = 0; $i < 3; $i++) {
9+
trim($missing);
10+
}
11+
?>
12+
--EXPECTF--
13+
Warning: Undefined variable $missing in %s on line %d
14+
15+
Deprecated: trim(): Passing null to parameter #1 ($string) of type string is deprecated in %s on line %d
16+
17+
Warning: Undefined variable $missing in %s on line %d
18+
19+
Deprecated: trim(): Passing null to parameter #1 ($string) of type string is deprecated in %s on line %d
20+
21+
Warning: Undefined variable $missing in %s on line %d
22+
23+
Deprecated: trim(): Passing null to parameter #1 ($string) of type string is deprecated in %s on line %d
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
--TEST--
2+
Repeated errors preserve error_get_last() when ignoring their source
3+
--INI--
4+
ignore_repeated_errors=1
5+
ignore_repeated_source=1
6+
error_reporting=-1
7+
html_errors=0
8+
--FILE--
9+
<?php
10+
trigger_error('S', E_USER_WARNING);
11+
$last = error_get_last();
12+
trigger_error('S', E_USER_NOTICE);
13+
var_dump(error_get_last() === $last);
14+
15+
/* A different file must also be ignored, even with the same line number. */
16+
eval(str_repeat("\n", $last['line'] - 1) . 'trigger_error("S", E_USER_NOTICE);');
17+
var_dump(error_get_last() === $last);
18+
19+
/* A filtered error still updates error_get_last(). */
20+
error_reporting(E_ALL & ~E_USER_DEPRECATED);
21+
trigger_error('D', E_USER_DEPRECATED);
22+
var_dump(error_get_last()['message']);
23+
trigger_error('S', E_USER_WARNING);
24+
var_dump(error_get_last()['type'] === E_USER_WARNING);
25+
var_dump(error_get_last()['message']);
26+
$last = error_get_last();
27+
trigger_error('S', E_USER_NOTICE);
28+
var_dump(error_get_last() === $last);
29+
30+
error_clear_last();
31+
var_dump(error_get_last());
32+
trigger_error('S', E_USER_NOTICE);
33+
var_dump(error_get_last()['type'] === E_USER_NOTICE);
34+
35+
/* With source comparison enabled, a different line is a new error. */
36+
ini_set('ignore_repeated_source', '0');
37+
trigger_error('S', E_USER_WARNING);
38+
var_dump(error_get_last()['type'] === E_USER_WARNING);
39+
40+
/* A hidden error of another type is still the most recent error. */
41+
ini_set('ignore_repeated_source', '1');
42+
error_reporting(E_ALL);
43+
error_clear_last();
44+
function trigger_hidden_error($type) {
45+
@trigger_error('S', $type);
46+
}
47+
trigger_hidden_error(E_USER_WARNING);
48+
trigger_hidden_error(E_USER_NOTICE);
49+
var_dump(error_get_last()['type']);
50+
?>
51+
--EXPECTF--
52+
Warning: S in %s on line %d
53+
bool(true)
54+
bool(true)
55+
string(1) "D"
56+
bool(true)
57+
string(1) "S"
58+
bool(true)
59+
NULL
60+
61+
Notice: S in %s on line %d
62+
bool(true)
63+
64+
Warning: S in %s on line %d
65+
bool(true)
66+
int(1024)

‎ext/standard/basic_functions.c‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,18 +1471,9 @@ PHP_FUNCTION(error_clear_last)
14711471
{
14721472
ZEND_PARSE_PARAMETERS_NONE();
14731473

1474-
if (PG(last_error_message)) {
1475-
PG(last_error_type) = 0;
1476-
PG(last_error_lineno) = 0;
1477-
1478-
zend_string_release(PG(last_error_message));
1479-
PG(last_error_message) = NULL;
1480-
1481-
if (PG(last_error_file)) {
1482-
zend_string_release(PG(last_error_file));
1483-
PG(last_error_file) = NULL;
1484-
}
1485-
}
1474+
PG(last_error_type) = 0;
1475+
PG(last_error_lineno) = 0;
1476+
php_clear_last_error(true);
14861477

14871478
zval_ptr_dtor(&EG(last_fatal_error_backtrace));
14881479
ZVAL_UNDEF(&EG(last_fatal_error_backtrace));

‎main/main.c‎

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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 */
17091732
static 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();

‎main/php_globals.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ struct _php_core_globals {
139139
uint32_t last_error_lineno;
140140
zend_string *last_error_message;
141141
zend_string *last_error_file;
142+
uint32_t repeated_error_lineno;
143+
zend_string *repeated_error_message;
144+
zend_string *repeated_error_file;
142145

143146
char *php_sys_temp_dir;
144147

‎main/php_main.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ PHPAPI char *php_get_version(sapi_module_struct *sapi_module);
4848
PHPAPI void php_print_version(sapi_module_struct *sapi_module);
4949

5050
PHPAPI void php_child_init(void);
51+
PHPAPI void php_clear_last_error(bool clear_repeated_errors);
5152
PHPAPI zend_result php_request_startup(void);
5253
PHPAPI void php_request_shutdown(void *dummy);
5354
PHPAPI zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_module);

0 commit comments

Comments
 (0)