clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix ZEND_RC_MOD_CHECK() for thread local ini parser strings
This commit is contained in:
Ilija Tovilo 2022-09-12 23:33:03 +02:00
commit 09aa27cc09
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_ini_parser.y
View File

@ -269,6 +269,9 @@ ZEND_API zend_result zend_parse_ini_string(char *str, bool unbuffered_errors, in
static void zval_ini_dtor(zval *zv)
{
if (Z_TYPE_P(zv) == IS_STRING) {
if (ZEND_SYSTEM_INI) {
GC_MAKE_PERSISTENT_LOCAL(Z_STR_P(zv));
}
zend_string_release(Z_STR_P(zv));
}
}
@ -324,6 +327,9 @@ statement:
printf("NORMAL: '%s' = '%s'\n", Z_STRVAL($1), Z_STRVAL($3));
#endif
ZEND_INI_PARSER_CB(&$1, &$3, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG);
if (ZEND_SYSTEM_INI) {
GC_MAKE_PERSISTENT_LOCAL(Z_STR($1));
}
zend_string_release(Z_STR($1));
zval_ini_dtor(&$3);
}