This repository has been archived by the owner on Feb 2, 2021. It is now read-only.
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.
As it appears
iconv
could fail and seterrno
toEINVAL
even ifICONV_SET_DISCARD_ILSEQ
is set [1]. In that case xctool should skip invalid UTF8 bytes [2], replace every invalid sequence of bytes with a replacement character [3].In this PR
StringFromDispatchDataWithBrokenUTF8Encoding
was updated to handle use cases described above. Iferrno
isEINVAL
then function skips all bytes until possible start of new sequence is detected. Theniconv
is used again to read them. At the end new string is composed from valid UTF8 substring and returned to a caller.Fixes #662.
Ref:
[1] https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man3/iconv.3.html
[2] https://en.wikipedia.org/wiki/UTF-8
[3] https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character