Repository navigation
Conversation
adapik
pushed a commit
to adapik/php-src
that referenced
this pull request
Oct 30, 2026
* PHP-8.4: Fix phpGH-25029: Align the fileinfo built-in magic database (php#25030)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
php_magic_databaseis a plainunsigned chararray, so it only gets 1-byte alignment, butapprentice_map()reads it asuint32_tand then as an array ofstruct magic. On strict-alignment CPUs like ARMv5 the header check reads garbage, the built-in database is rejected and every finfo call fails. Cross-compiling for armv5te with-Osputs the array in a.rodatasection with alignment 1 (at offset 3 in a small test object). This declares it withZEND_SET_ALIGNED(8, ...)increate_data_file.phpand in the generateddata_file.c.Fixes #25029