Skip to content

[pull] master from php:master #1131

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

Merged
merged 5 commits into from
Oct 18, 2025
Merged

[pull] master from php:master #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
560a16f
phar: Fix potential double free on Windows (#20211)
nielsdos Oct 18, 2025
cf3b70d
pgsql: Fix memory leak when first string conversion fails
nielsdos Oct 18, 2025
d992cd8
Merge branch 'PHP-8.3' into PHP-8.4
nielsdos Oct 18, 2025
9282111
Merge branch 'PHP-8.4' into PHP-8.5
nielsdos Oct 18, 2025
81fef09
Merge branch 'PHP-8.5'
nielsdos Oct 18, 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
12 changes: 5 additions & 7 deletions ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,15 +1225,13 @@ PHP_FUNCTION(pg_query)

static void _php_pgsql_free_params(char **params, int num_params)
{
if (num_params > 0) {
int i;
for (i = 0; i < num_params; i++) {
if (params[i]) {
efree(params[i]);
}
int i;
for (i = 0; i < num_params; i++) {
if (params[i]) {
efree(params[i]);
}
efree(params);
}
efree(params);
}

/* Execute a query */
Expand Down
6 changes: 0 additions & 6 deletions ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@ static phar_action_status phar_file_action(phar_archive_data *phar, phar_entry_i
highlight_file(name, &syntax_highlighter_ini);

efree(name);
#ifdef PHP_WIN32
efree(arch);
#endif
return PHAR_ACT_DO_EXIT;
case PHAR_MIME_OTHER:
/* send headers, output file contents */
Expand Down Expand Up @@ -274,9 +271,6 @@ static phar_action_status phar_file_action(phar_archive_data *phar, phar_entry_i
}

zend_destroy_file_handle(&file_handle);
#ifdef PHP_WIN32
efree(arch);
#endif
if (new_op_array) {
ZVAL_UNDEF(&result);

Expand Down