Skip to content

Keep EG(errors) buffer consistent on erealloc failure #23257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edorian wants to merge 1 commit into
base: PHP-8.5
Choose a base branch
from
+4 −3
Open

Keep EG(errors) buffer consistent on erealloc failure #23257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Zend/zend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,9 +1486,10 @@ ZEND_API ZEND_COLD void zend_error_zstr_at(

/* This is very inefficient for a large number of errors.
* Use pow2 realloc if it becomes a problem. */
EG(num_errors)++;
EG(errors) = erealloc(EG(errors), sizeof(zend_error_info*) * EG(num_errors));
EG(errors)[EG(num_errors)-1] = info;
uint32_t new_num_errors = EG(num_errors) + 1;
EG(errors) = erealloc(EG(errors), sizeof(zend_error_info*) * new_num_errors);
EG(errors)[EG(num_errors)] = info;
EG(num_errors) = new_num_errors;

/* Do not process non-fatal recorded error */
if (!(type & E_FATAL_ERRORS) || (type & E_DONT_BAIL)) {
Expand Down