Merge branch 'PHP-8.1'

Fix #81723: Memory corruption in finfo_buffer()

We need to use the same memory allocator throughout.

libmagic: use php_memnstr instead of memmem

Closes GH-8391.

Revert "fileinfo: Obey POSIX in pattern conversion"

This reverts commit 343d1c2b1f2c6d267f1c63d17ca1c4d2349bf998.

Also remove the incompatible test data for time being. The new line

Revert "fileinfo: Obey POSIX in pattern conversion"

This reverts commit 343d1c2b1f2c6d267f1c63d17ca1c4d2349bf998.

Also remove the incompatible test data for time being. The new line
handling will need an extra fix.

Signed-off-by: Anatol Belski <ab@php.net>

show more ...

fileinfo: Obey POSIX in pattern conversion

Signed-off-by: Anatol Belski <ab@php.net>

fileinfo: Turn back the WS check mitigation

Looks like there's still a timing issue shown on some pipeline runs.

Signed-off-by: Anatol Belski <ab@php.net>

fileinfo: Port libmagic 5.40

Signed-off-by: Anatol Belski <ab@php.net>

Revert "libmagic: Move the allocation on the stack"

This reverts commit 1d84a58736541b61fc9d569580715940e32d55c9.

Signed-off-by: Anatol Belski <ab@php.net>

libmagic: Constify arg

libmagic: Move the allocation on the stack

fileinfo: Followup fixes

Signed-off-by: Anatol Belski <ab@php.net>

fileinfo: Upgrade to libmagic 5.39

Signed-off-by: Anatol Belski <ab@php.net>

Drop various unused macros/APIs

Also convert_libmagic_pattern() to return a zend_string*

Closes GH-6029

Fix #79283: Segfault in libmagic patch contains a buffer overflow

To solve this, we properly calculate the required string length upfront
instead of allocating an oversized string (`len

Fix #79283: Segfault in libmagic patch contains a buffer overflow

To solve this, we properly calculate the required string length upfront
instead of allocating an oversized string (`len * 4 + 4`).

show more ...

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #74170: locale information change after mime_content_type

Fix #74170: locale information change after mime_content_type

Some functions in libmagic (distributed with fileinfo extension) perform this sequence of calls:
func() {
setlocale(LC_T

Fix #74170: locale information change after mime_content_type

Some functions in libmagic (distributed with fileinfo extension) perform this sequence of calls:
func() {
setlocale(LC_TYPE, "C")
.. do some work ..
setlocale(LC_TYPE, "")
}

It effectively resets LC_TYPE if it that was set before the function call.

To avoid manipulations with current locale at all, the problematic functions
were modified to use locale-independent functions.

show more ...

Ported limagic 5.37

Accept zend_string* instead of char* in php_pcre_match_impl()

Remove preg_options param from pcre_get_compiled_regex()

This parameter is always zero and not necessary to call pcre2_match.

I'm leaving the parameter behind on the _ex() variant,

Remove preg_options param from pcre_get_compiled_regex()

This parameter is always zero and not necessary to call pcre2_match.

I'm leaving the parameter behind on the _ex() variant, so the preg_flags
are still accessible in some way.

show more ...

Fix regex

Rework places in libmagic regarding previous CVE-2014-3538 fixes

CVE-2014-3538 was fixed upstream, but the old patch was still kept in
the PHP port. This patch causes performance regress

Rework places in libmagic regarding previous CVE-2014-3538 fixes

CVE-2014-3538 was fixed upstream, but the old patch was still kept in
the PHP port. This patch causes performance regressions when PCRE JIT is
not enabled. This is fixed by applying the relevant original code from
the newer libmagic, which makes the old patch obsolete as the
CVE-2014-3538 tests still pass.

show more ...

Align the ported place with libmagic

Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.

Use suitable datatypes

Port libmagic 5.33