Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix GH-15028: Memory leak in ext/phar/stream.c
  Fix GH-15023: Memory leak in Zend/zend_ini.c
  Fix GH-15020: Memory leak in Zend/Optimizer/escape_analysis.c
This commit is contained in:
Niels Dossche 2024-07-19 14:59:57 +02:00
commit 442ae96444
No known key found for this signature in database
GPG Key ID: B8A8AD166DF0E2E5
3 changed files with 3 additions and 0 deletions

View File

@ -414,6 +414,7 @@ zend_result zend_ssa_escape_analysis(const zend_script *script, zend_op_array *o
}
if (zend_build_equi_escape_sets(ees, op_array, ssa) == FAILURE) {
free_alloca(ees, use_heap);
return FAILURE;
}

View File

@ -243,6 +243,7 @@ ZEND_API zend_result zend_register_ini_entries_ex(const zend_ini_entry_def *ini_
if (p->name) {
zend_string_release_ex(p->name, 1);
}
pefree(p, true);
zend_unregister_ini_entries_ex(module_number, module_type);
return FAILURE;
}

View File

@ -782,6 +782,7 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, const char *url_from
}
if (PHAR_G(readonly) && (!pto || !pto->is_data)) {
php_url_free(resource_from);
php_url_free(resource_to);
php_error_docref(NULL, E_WARNING, "phar error: Write operations disabled by the php.ini setting phar.readonly");
return 0;
}