iconv: keep working converter when stream filter seek reset fails - #23594
Open
iliaal wants to merge 1 commit into
Open
iconv: keep working converter when stream filter seek reset fails#23594iliaal wants to merge 1 commit into
iliaal wants to merge 1 commit into
Conversation
php_iconv_stream_filter_seek() closed the filter's converter before knowing whether a replacement could be opened, then stored the failed iconv_open() result. That left self->cd as (iconv_t)-1 for every later read and write, and for the iconv_close() in the filter dtor. Open the replacement first and only swap it in on success. Closes phpGH-23594
iliaal
force-pushed
the
promote/iconv-seek-stale-cd
branch
from
September 6, 2026 15:08
44357b1 to
6512054
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.
php_iconv_stream_filter_seek()closed the filter's converter before knowing whether a replacement could be opened, then assigned the failediconv_open()result. That left self->cd as (iconv_t)-1 for every subsequent read and write, and the filter dtor then called iconv_close() on it. Opening the replacement first and swapping it in only on success keeps the working converter on failure.No test: the charsets are fixed when the filter is created and already validated by the iconv_open() there, so a second open of the same pair can only fail on OOM. There is no userland input that reaches the branch.