Skip to content

Update libmagic to 5.45 #13369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Feb 13, 2024
Merged

Update libmagic to 5.45 #13369

merged 3 commits into from
Feb 13, 2024

Conversation

nielsdos
Copy link
Member

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.

@nielsdos
Update libmagic to 5.45
71a51f4 
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.
@nielsdos
Adjust memory requirement for s390x fileinfo run
878c390 
The larger database causes a higher memory usage.
Similar to 962c082.
devnexen
devnexen approved these changes Feb 11, 2024
View reviewed changes
Copy link
Member

@devnexen devnexen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good but would like @Girgias opinion

@nielsdos nielsdos merged commit b7c5813 into php:master Feb 13, 2024
@iluuu1994
Copy link
Member

iluuu1994 commented Feb 15, 2024 •
edited
Loading

I think this caused a regression in the following test on 32-bit: ext/fileinfo/tests/finfo_upstream.phpt
https://github.com/php/php-src/actions/runs/7895128086/job/21547013803
Same for Windows:
https://github.com/php/php-src/actions/runs/7895128086/job/21547023287

@nielsdos nielsdos mentioned this pull request Feb 15, 2024
Merged
@nielsdos
Copy link
Member Author

I think this caused a regression in the following test on 32-bit: ext/fileinfo/tests/finfo_upstream.phpt https://github.com/php/php-src/actions/runs/7895128086/job/21547013803 Same for Windows: https://github.com/php/php-src/actions/runs/7895128086/job/21547023287

Fix here: #13404

@outtersg outtersg mentioned this pull request Mar 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devnexen devnexen

@Girgias Girgias

Assignees
No one assigned
Labels
Category: Build System Extension: fileinfo
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nielsdos @iluuu1994 @devnexen @Girgias