mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Prevent bailout during imap shutdown error reporting
This commit is contained in:
commit
85eafc31e8
@ -659,7 +659,9 @@ PHP_RSHUTDOWN_FUNCTION(imap)
|
||||
if (EG(error_reporting) & E_NOTICE) {
|
||||
ecur = IMAPG(imap_errorstack);
|
||||
while (ecur != NIL) {
|
||||
php_error_docref(NULL, E_NOTICE, "%s (errflg=%ld)", ecur->LTEXT, ecur->errflg);
|
||||
zend_try {
|
||||
php_error_docref(NULL, E_NOTICE, "%s (errflg=%ld)", ecur->LTEXT, ecur->errflg);
|
||||
} zend_end_try();
|
||||
ecur = ecur->next;
|
||||
}
|
||||
}
|
||||
@ -672,7 +674,9 @@ PHP_RSHUTDOWN_FUNCTION(imap)
|
||||
if (EG(error_reporting) & E_NOTICE) {
|
||||
acur = IMAPG(imap_alertstack);
|
||||
while (acur != NIL) {
|
||||
php_error_docref(NULL, E_NOTICE, "%s", acur->LTEXT);
|
||||
zend_try {
|
||||
php_error_docref(NULL, E_NOTICE, "%s", acur->LTEXT);
|
||||
} zend_end_try();
|
||||
acur = acur->next;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user