Fix _dump_str crash and wrong encoding for hex escape sequences#453
Open
bysiber wants to merge 1 commit intouiri:masterfrom
Open
Fix _dump_str crash and wrong encoding for hex escape sequences#453bysiber wants to merge 1 commit intouiri:masterfrom
bysiber wants to merge 1 commit intouiri:masterfrom
Conversation
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
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.
Summary
_dump_strinencoder.pycrashes with anIndexErrorwhen encoding strings that start with a control character (like\x01), and silently produces invalid TOML for strings with control characters in the middle.Problem
The
\xescape handling in_dump_struses a split-and-rejoin approach that has two issues:When the
\xescape occurs at the very start of the string,split("\\x")produces an empty first element. The code removes this empty element withv = v[1:], but then unconditionally accessesv[1]which no longer exists → IndexError.The joiner logic is inverted. When the character before
\xis NOT a backslash (meaning it's a real hex escape fromrepr()), the code uses"x"as the joiner — which just drops the backslash and puts the literal characterxback. This produces wrong output like"ax01b"instead of"a\u0001b".Fix
Replace the fragile split/loop approach with a straightforward character-by-character scan that processes backslash sequences left-to-right:
\\(escaped backslash pair) → kept as-is\x(hex escape) → converted to\u00for TOML compatibility\Xsequences → kept as-isThis correctly handles all combinations including
\\x(literal backslash + x),\\\x(literal backslash + hex escape), and strings starting with\x.