Update libmagic to 5.45 (#13369)

* Update libmagic to 5.45

This also cleans up magicdata.patch: changes that are already in upstream file
were removed from that patch file.

Update libmagic to 5.45 (#13369)

* Update libmagic to 5.45

This also cleans up magicdata.patch: changes that are already in upstream file
were removed from that patch file.

There are five (expected) test output changes.
All these were also checked with the file command.

- bug77961.phpt changes because there's now an early error-return in the
`if (ts == FILE_BADSIZE) {` branch.
- cve-2014-1943.phpt and cve-2014-1943-mb.phpt change because now the crafted
data is recognised as a simh file.
- bug71434.phpt now properly recognises it as a Python file.
- ext/fileinfo/tests/finfo_file_basic.phpt more specific mime type.

* Adjust memory requirement for s390x fileinfo run

The larger database causes a higher memory usage.
Similar to 962c082a5b7b94f7a3779378e8ab83bedb4445ad.

* [ci skip] NEWS

show more ...

Minor pcre optimizations (#12923)

* Update signature of pcre API

This changes the variables that are bools to actually be bools instead
of ints, which allows some additional opt

Minor pcre optimizations (#12923)

* Update signature of pcre API

This changes the variables that are bools to actually be bools instead
of ints, which allows some additional optimization by the compiler (e.g.
removing some ternaries and move extensions).

It also gets rid of the use_flags argument because that's just the same
as flags == 0. This reduces the call frame.

* Use zend_string_release_ex where possible

* Remove duplicate symbols from strchr

* Avoid useless value conversions

* Use a raw HashTable* instead of a zval

* Move condition

* Make for loop cheaper by reusing a recently used value as start iteration index

* Remove useless condition

This can't be true if the second condition is true because it would
require the string to occupy the entire address space.

* Upgrading + remark

show more ...

Use new ZSTR_INIT_LITERAL macro (#10879)

libmagic: Keep the WS limitation piece

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

libmagic: Follow up fixes for 5.43

Fixes possible build and runtime issues on Windows.`

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

fileinfo: libmagic: Simplify libmagic patch

For the time being, the new args passing pre-compiled regex are cut out.
On the PHP side, PCRE patterns are cached and thus a duplicated
m

fileinfo: libmagic: Simplify libmagic patch

For the time being, the new args passing pre-compiled regex are cut out.
On the PHP side, PCRE patterns are cached and thus a duplicated
mechanism isn't necessary.

There might be still advantages to carry pre-compiled patterns for
libmagic separately, but reusing this mechanism needs a better
consideration, as it might require to retain from the PHP internal pattern
caching mechanism.

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

show more ...

fileinfo: Introduce php_libmagic.* to simplify patch

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

fileinfo: libmagic: Apply libmagic.patch

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

fileinfo: libmagic: Check in unpatched 5.43

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

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 ...