Fix panic in EscapeQuotedString and parse_flush, clean up a few unwraps#2330
Merged
iffyio merged 4 commits intoapache:mainfrom May 6, 2026
Merged
Fix panic in EscapeQuotedString and parse_flush, clean up a few unwraps#2330iffyio merged 4 commits intoapache:mainfrom
iffyio merged 4 commits intoapache:mainfrom
Conversation
Replace if x.is_some() { x.as_ref().unwrap() }
with if let Some(x) = x { x }
This could previously panick with multi-byte utf8 characters: datafusion-sqlparser-rs-896df239ce2264c8/847ddf3/src/ast/value.rs:583:53: end byte index 271 is not a char boundary; it is inside '�' (bytes 270..273 of string)
iffyio
reviewed
May 5, 2026
| // Including idx in the range, so the quote at idx will be printed twice: | ||
| // in this call to write_str() and in the next one. | ||
| f.write_str(&self.string[start_idx..=idx])?; | ||
| let end_idx = idx + ch.len_utf8(); |
Contributor
There was a problem hiding this comment.
could we add a test case that fails without this fix?
Contributor
Author
There was a problem hiding this comment.
Sure, I've added a test. Notably though, this crash is not reachable with normal sqlparser usage because escape_quoted_string is only called with ASCII quote chars. I've only encountered this due to the way I'm using sqlparser for my input generation experiments.
iffyio
approved these changes
May 6, 2026
Contributor
iffyio
left a comment
iffyio
left a comment
There was a problem hiding this comment.
LGTM! Thanks @Mrmaxmeier!
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
2 participants
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.
Hi,
I tried generating SQL inputs with
sqlparserand ran into a few crashes. In the process of fixing these, I've also refactored some of the code inast/to avoid unwraps where applicable.Let me know if I should add tests for the two commits that actually change behaviour.
Thanks!