archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4' into PHP-8.0

Browse source 
* PHP-7.4:
  Prevent bailout during imap shutdown error reporting
This commit is contained in:
Nikita Popov 2021-08-17 10:35:07 +02:00
commit 85eafc31e8
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/imap/php_imap.c
View file

@ -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;
}
}