Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c

Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c

libpcre2 can return the special value -1 for a non-match.
In this case we get pointer overflow, although it doesn't matter i

Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c

libpcre2 can return the special value -1 for a non-match.
In this case we get pointer overflow, although it doesn't matter in
practice because the pointer will be in bounds and the copy length will
be 0. Still, we should fix the UBSAN warning.

Closes GH-16205.

show more ...

Merge branch 'PHP-8.2' into PHP-8.3

Fix GH-16189: underflow on preg_match/preg_match_all start_offset.

close GH-16191

Merge branch 'PHP-8.2'

* PHP-8.2:
Revert "Mangle PCRE regex cache key with JIT option"

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Revert "Mangle PCRE regex cache key with JIT option"

Revert "Mangle PCRE regex cache key with JIT option"

This reverts commit 466fc78d2c373eae6acad4bd5a4553c5c0d1d18b.

Merge branch 'PHP-8.2'

* PHP-8.2:
Mangle PCRE regex cache key with JIT option

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Mangle PCRE regex cache key with JIT option

Mangle PCRE regex cache key with JIT option

Closes GH-11396

Merge branch 'PHP-8.2'

* PHP-8.2:
Fix preg_replace_callback_array() pattern validation

Fix preg_replace_callback_array() pattern validation

Closes GH-11301

Merge branch 'PHP-8.2'

* PHP-8.2:
Fix incorrect zval type_flags in preg_replace_callback_array() for immutable arrays

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Fix incorrect zval type_flags in preg_replace_callback_array() for immutable arrays

Fix incorrect zval type_flags in preg_replace_callback_array() for immutable arrays

The ZVAL_ARR macro always set the zval type_info to IS_ARRAY_EX, even if the
hash table is immutable.

Fix incorrect zval type_flags in preg_replace_callback_array() for immutable arrays

The ZVAL_ARR macro always set the zval type_info to IS_ARRAY_EX, even if the
hash table is immutable. Since in preg_replace_callback_array() we can return
the passed array directly, and that passed array can be immutable, we need to
reset the type_flags to keep the VM from performing ref-counting on the array.

Fixes GH-10968
Closes GH-10970

show more ...

Remove pcre_get_compiled_regex_ex() (#10354)

Revert GH-10220

Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816>.

This reverts commit ecc880f491d66081298a16634629f149459706a9.
This reverts commit 588a07

Revert GH-10220

Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816>.

This reverts commit ecc880f491d66081298a16634629f149459706a9.
This reverts commit 588a07f7371ee2b5fac17de147926780e427fae6.
This reverts commit f377e15751d3aa48b69cd9bcc366ede7803d511f.
This reverts commit b4ba16fe189b109144aff669e11d81365160104b.
This reverts commit 694ec1deea36e366b28b6349a52be49824e1a1a8.
This reverts commit 6b34de8eba9f66882ae16e6073af28783670ac53.
This reverts commit aa1cd02a4367834026ea2205ea13a2f904455aa1.
This reverts commit 308fd311ea6fcf3094b448df7f2b264f08e4fe4f.
This reverts commit 16203b53e1822a37b6ba6f2ab198bb435d05fdad.
This reverts commit 738fb5ca5412f5e833a7fab82b11519e635a3357.
This reverts commit 9fdbefacd3c382d731aa175b7bdc002ec9cb2b30.
This reverts commit cd4a7c1d90562ebb5f89caf94d00d579631b9fbe.
This reverts commit 928685eba2b2f0ded90e7f78fd806ea164002f6e.
This reverts commit 01e5ffc85cd4357fd7b5b7ceefa29f2d10ca26b7.

show more ...

ext/{standard,json,random,...}: add missing includes

Update INI validator and displayers depending on INI type

Closes GH-9451

Declare ext/pcre constants in stubs (#9077)

Implement #77726: Allow null character in regex patterns

In 8b3c1a3, this was disallowed to fix #55856, which was a security
issue caused by the /e modifier. The fix that was made was th

Implement #77726: Allow null character in regex patterns

In 8b3c1a3, this was disallowed to fix #55856, which was a security
issue caused by the /e modifier. The fix that was made was the
"Easier fix" as described in the original report.

With this fix, pattern strings are no longer treated as null terminated,
so null characters can be placed inside and matched against with regex
patterns without security problems, so there is no longer a reason to
give the error. Allowing this is consistent with the behaviour of many
other languages, including JavaScript, and thanks to PCRE2[0], it does
not require manually escaping null characters. Now that we can avoid the
error here without the cost of escaping characters, there is really no
need anymore to stray here from the conventional behaviour.

Currently, null characters are still disallowed before the first
delimiter and in the options section at the end of a regex string, but
these error messages have been updated.

[0] Since PCRE2, pattern strings no longer have to be null terminated,
and raw null characters match as normal.

Closes GH-8114.

show more ...

Merge branch 'PHP-8.1'

* PHP-8.1:
Fix #74604: Out of bounds in php_pcre_replace_impl

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix #74604: Out of bounds in php_pcre_replace_impl

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #74604: Out of bounds in php_pcre_replace_impl

Fix #74604: Out of bounds in php_pcre_replace_impl

Trying to allocate a `zend_string` with a length only slighty smaller
than `SIZE_MAX` causes an integer overflow; we make sure that thi

Fix #74604: Out of bounds in php_pcre_replace_impl

Trying to allocate a `zend_string` with a length only slighty smaller
than `SIZE_MAX` causes an integer overflow; we make sure that this
doesn't happen by catering to the maximal overhead of a `zend_string`.

Closes GH-7597.

show more ...