holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parse_string_strict() to detect unbalanced quotes properly (#4928)

Browse Source
This commit is contained in:
Tomoki Aonuma 2022-03-25 01:57:03 +09:00 committed by GitHub
parent ea7c8c237e
commit 90013295aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/nu-parser/src/parser.rs
View File

@ -2391,17 +2391,28 @@ pub fn parse_string_strict(
let bytes = working_set.get_span_contents(span); let bytes = working_set.get_span_contents(span);
// Check for unbalanced quotes: // Check for unbalanced quotes:
if (bytes.starts_with(b"\"") || (bytes.starts_with(b"$\""))) && !bytes.ends_with(b"\"") { {
return (garbage(span), Some(ParseError::Unclosed("\"".into(), span))); let bytes = if bytes.starts_with(b"$") {
} &bytes[1..]
if (bytes.starts_with(b"\'") || (bytes.starts_with(b"$\""))) && !bytes.ends_with(b"\'") { } else {
return (garbage(span), Some(ParseError::Unclosed("\'".into(), span))); bytes
};
if bytes.starts_with(b"\"") && (bytes.len() == 1 || !bytes.ends_with(b"\"")) {
return (garbage(span), Some(ParseError::Unclosed("\"".into(), span)));
}
if bytes.starts_with(b"\'") && (bytes.len() == 1 || !bytes.ends_with(b"\'")) {
return (garbage(span), Some(ParseError::Unclosed("\'".into(), span)));
}
} }
let (bytes, quoted) = if (bytes.starts_with(b"\"") && bytes.ends_with(b"\"") && bytes.len() > 1) let (bytes, quoted) = if (bytes.starts_with(b"\"") && bytes.ends_with(b"\"") && bytes.len() > 1)
|| (bytes.starts_with(b"\'") && bytes.ends_with(b"\'") && bytes.len() > 1) || (bytes.starts_with(b"\'") && bytes.ends_with(b"\'") && bytes.len() > 1)
{ {
(&bytes[1..(bytes.len() - 1)], true) (&bytes[1..(bytes.len() - 1)], true)
} else if (bytes.starts_with(b"$\"") && bytes.ends_with(b"\"") && bytes.len() > 2)
|| (bytes.starts_with(b"$\'") && bytes.ends_with(b"\'") && bytes.len() > 2)
{
(&bytes[2..(bytes.len() - 1)], true)
} else { } else {
(bytes, false) (bytes, false)
}; };