From ae017c3f96ffb88c4b918bb761757798bf7dd84c Mon Sep 17 00:00:00 2001 From: Smit Barmase Date: Fri, 14 Mar 2025 17:20:33 +0000 Subject: [PATCH] file_finder: Fix panic when file name contains new line (#26791) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #26777 This PR fixes a panic when a file name contains a newline and a multi-byte character like 👋 (4 bytes in UTF-8). The issue was in the regex not considering newlines in file names, causing it to match only the latter part of the file name. For example: ``` left: PathWithPosition { path: "ab", row: None, column: None } // matched right: PathWithPosition { path: "ab\ncd", row: None, column: None } // actual file name ``` This resulted in incorrect index calculation later in the code, which went unnoticed until now due to the lack of tests with file names containing newlines. We discovered this issue when a panic occurred due to incorrect index calculation while trying to get the index of a multi-byte character. After the newline fix, the index calculation is always correct, even in the case of multi-byte characters. Release Notes: - Fixed an issue where file names with newlines and multi-byte characters could cause a crash in certain cases. --- crates/util/src/paths.rs | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs index 1852f4f44c..ecaa0d9bc2 100644 --- a/crates/util/src/paths.rs +++ b/crates/util/src/paths.rs @@ -169,7 +169,7 @@ impl> From for SanitizedPath { /// A delimiter to use in `path_query:row_number:column_number` strings parsing. pub const FILE_ROW_COLUMN_DELIMITER: char = ':'; -const ROW_COL_CAPTURE_REGEX: &str = r"(?x) +const ROW_COL_CAPTURE_REGEX: &str = r"(?xs) ([^\(]+)(?: \((\d+)[,:](\d+)\) # filename(row,column), filename(row:column) | @@ -624,6 +624,24 @@ mod tests { column: None } ); + + assert_eq!( + PathWithPosition::parse_str("ab\ncd"), + PathWithPosition { + path: PathBuf::from("ab\ncd"), + row: None, + column: None + } + ); + + assert_eq!( + PathWithPosition::parse_str("👋\nab"), + PathWithPosition { + path: PathBuf::from("👋\nab"), + row: None, + column: None + } + ); } #[test]