Skip to content

Zend internal changes: error handling and zend_make_compiled_string_description() takes in account lineno is uint32_t #20565

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
wants to merge 7 commits into
base: master
Choose a base branch
from
+21 −7
Open

Zend internal changes: error handling and zend_make_compiled_string_description() takes in account lineno is uint32_t #20565

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b253d3
Zend errors handling internal changes.
devnexen Nov 23, 2025
7b4c6c9
update its destructor workflow
devnexen Nov 23, 2025
b98796a
note to self..
devnexen Nov 23, 2025
b4f31c4
fix attempt
devnexen Nov 23, 2025
193959a
ditto
devnexen Nov 23, 2025
9d7b6bd
apply suggestion
devnexen Nov 23, 2025
d9f84e7
little optim attempt
devnexen Nov 23, 2025
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
28 changes: 21 additions & 7 deletions Zend/zend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,10 +1483,24 @@ ZEND_API ZEND_COLD void zend_error_zstr_at(
info->filename = zend_string_copy(error_filename);
info->message = zend_string_copy(message);

/* 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));
// pondering if uint32_t is more appropriate but would need to align the allocation size then
size_t *errors_size;

if (EG(num_errors) == 1) {
errors_size = emalloc(sizeof(size_t) + (2 * sizeof(zend_error_info *)));
// can be seen as "waste" but to have a round even number from start
*errors_size = 2;
} else {
errors_size = (size_t *)(EG(errors) - 1);
if (EG(num_errors) == *errors_size) {
size_t tmp = *errors_size + (*errors_size >> 1);
// not sure we can get high number of errors so safe `might be` over cautious here
errors_size = safe_erealloc(errors_size, sizeof(size_t) + (tmp * sizeof(zend_error_info *)), 1, 0);
*errors_size = tmp;
}
}
EG(errors) = (zend_error_info **)(errors_size + 1);
EG(errors)[EG(num_errors)-1] = info;

/* Do not process non-fatal recorded error */
Expand Down Expand Up @@ -1803,9 +1817,9 @@ ZEND_API void zend_free_recorded_errors(void)
zend_error_info *info = EG(errors)[i];
zend_string_release(info->filename);
zend_string_release(info->message);
efree(info);
efree_size(info, sizeof(zend_error_info));
}
efree(EG(errors));
efree(((size_t *)EG(errors)) - 1);
EG(errors) = NULL;
EG(num_errors) = 0;
}
Expand Down Expand Up @@ -2016,12 +2030,12 @@ ZEND_API zend_result zend_execute_scripts(int type, zval *retval, int file_count
}
/* }}} */

#define COMPILED_STRING_DESCRIPTION_FORMAT "%s(%d) : %s"
#define COMPILED_STRING_DESCRIPTION_FORMAT "%s(%u) : %s"

ZEND_API char *zend_make_compiled_string_description(const char *name) /* {{{ */
{
const char *cur_filename;
int cur_lineno;
uint32_t cur_lineno;
char *compiled_string_description;

if (zend_is_compiling()) {
Expand Down
Loading