TSRM: roll back id_count when the resource type table cannot grow - #23595
Open
iliaal wants to merge 1 commit into
Open
TSRM: roll back id_count when the resource type table cannot grow#23595iliaal wants to merge 1 commit into
iliaal wants to merge 1 commit into
Conversation
ts_allocate_id(), ts_allocate_fast_id_at() and ts_allocate_tls_id() increment id_count before growing resource_types_table. When the realloc fails they return 0 with id_count still counting the new slot, so allocate_new_resource() later walks j < id_count and reads an entry that was never initialized. Roll id_count back on those three paths. Closes phpGH-23595
iliaal
force-pushed
the
promote/tsrm-id-count-rollback
branch
from
September 6, 2026 15:08
f51c132 to
8b701bd
Compare
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
1 participant
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.
ts_allocate_id(),ts_allocate_fast_id_at()andts_allocate_tls_id()each doid_count++before growingresource_types_table. If the realloc fails they return 0 with id_count still counting the new slot, so resource_types_table_size < id_count from then on andallocate_new_resource()walks j < id_count over an entry that was never initialized.This targets master rather than a stable branch because it is unreachable without an allocation failure, and TSRM.c has diverged. The PHP-8.4 shape has only two increment sites and puts one of them in
ts_allocate_fast_id(), which on master no longer increments at all, so the same diff would be wrong there. No test: the branch needs a failing realloc during ZTS startup, which has no userland surface. Verified against a--enable-ztsbuild.