iconv: keep working converter when filter seek reset fails - #294
Open
iliaal wants to merge 1 commit into
Open
Conversation
php_iconv_stream_filter_seek() assigned the failed iconv_open() result ((iconv_t)-1) to the filter's converter on reset failure, poisoning it for every subsequent read/write, and closed the previous converter before knowing whether a replacement could be opened. Open the new converter first and only close/replace the old one on success, so a failed reset leaves the filter with its still-working converter.
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() assigned the failed iconv_open() result ((iconv_t)-1) to the filter's converter on reset failure, poisoning the filter for every subsequent read/write, and it closed the previous converter before knowing whether a replacement could be opened.
Open the new converter first and only close/replace the old one on success, so a failed reset leaves the filter with its still-working converter. No regression test: an iconv_open() failure mid-seek is not reachable from userland (the filter's charsets are fixed at creation), so this ships as a defensive correctness fix per our test-only-when-triggerable rule. ext/iconv suite 73 tests, 0 failures.