Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Fix GH-20329: Remove CE cache from non-interned file cache strings #20337

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.

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

Closed
arnaud-lb wants to merge 2 commits into php:PHP-8.3 from arnaud-lb:gh20329

Conversation

@arnaud-lb
Copy link
Member

@arnaud-lb arnaud-lb commented Oct 30, 2025
edited
Loading

Possible fix for GH-20329.

  • In SERIALIZE_STR(), ensure that we update the right copy of the string. ptr is an interior pointer to script->mem, which is SHM or a temporary serialization of the script. buf is the copy of script->mem that will be written to the file cache.
  • Remove the IS_STR_CLASS_NAME_MAP_PTR flag

NB: I'm wondering if the if (script->corrupted) branch is useful, as we update flags in the same way in UNSERIALIZE_STR().

@arnaud-lb arnaud-lb changed the title (削除) Remove CE cache from non-interned file cache strings (削除ここまで) (追記) Fix GH-20329: Remove CE cache from non-interned file cache strings (追記ここまで) Oct 30, 2025
@arnaud-lb arnaud-lb marked this pull request as ready for review October 30, 2025 15:25
Copy link
Member

@dstogov dstogov left a comment

Choose a reason for hiding this comment

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

I think moving all string flags update into UNSERIALIZE_STR() (including IS_STR_CLASS_NAME_MAP_PTR) would be more clear.

Copy link
Member Author

I agree. I've updated accordingly

Copy link
Member

@dstogov dstogov left a comment

Choose a reason for hiding this comment

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

I think this is right.

arnaud-lb reacted with thumbs up emoji
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dstogov dstogov dstogov approved these changes

Assignees

No one assigned

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /