Skip to content

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.

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.
The larger database causes a higher memory usage.
Similar to 962c082.
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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants