FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix str.expandtabs aborting on a tab size of zero by luantaraschi · Pull Request #8562 · RustPython/RustPython · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (1) .rs  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
33 changes: 33 additions & 0 deletions crates/common/src/str.rs
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
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,15 @@ pub mod levenshtein {
/// Replace all tabs in a string with spaces, using the given tab size.
#[must_use]
pub fn expandtabs(input: &str, tab_size: usize) -> String {
// A tab size of zero, which is also where a negative one lands, leaves no
// column for a tab to advance to: the tabs come out and nothing else moves.
// Going through the arithmetic anyway subtracts the current column from a
// tab stop of zero and underflows on the first tab, so the width asked for
// next is `usize::MAX`. The bytes version of this already returns here.
if tab_size == 0 {
return input.chars().filter(|ch| *ch != '\t').collect();
}

let tab_stop = tab_size;
let mut expanded_str = String::with_capacity(input.len());
let mut tab_size = tab_stop;
Expand Down Expand Up @@ -905,4 +914,28 @@ mod tests {
let s = "0😀😃😄😁😆😅😂🤣9";
assert_eq!(get_chars(s, 3..7), "😄😁😆😅");
}

#[test]
fn expandtabs_with_zero_tab_size_drops_tabs() {
// A tab that follows a character used to subtract that column from a
// tab stop of zero, so the width of the run of spaces came out as
// `usize::MAX` and the allocation aborted the process.
assert_eq!(expandtabs("a\tb", 0), "ab");
assert_eq!(expandtabs("ab\tcd\tef", 0), "abcdef");
assert_eq!(expandtabs("a\nb\tc", 0), "a\nbc");
assert_eq!(expandtabs("á\tb", 0), "áb");
assert_eq!(expandtabs("\ta", 0), "a");
assert_eq!(expandtabs("\t", 0), "");
assert_eq!(expandtabs("", 0), "");
assert_eq!(expandtabs("no tabs", 0), "no tabs");
}

#[test]
fn expandtabs_with_a_real_tab_size_is_unchanged() {
assert_eq!(expandtabs("a\tb", 8), "a b");
assert_eq!(expandtabs("a\tb", 1), "a b");
assert_eq!(expandtabs("abcd\te", 4), "abcd e");
assert_eq!(expandtabs("a\nb\tc", 4), "a\nb c");
assert_eq!(expandtabs("\ta", 4), " a");
}
}
28 changes: 28 additions & 0 deletions extra_tests/snippets/builtin_str.py
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
Original file line number Diff line number Diff line change
Expand Up @@ -951,3 +951,31 @@ def test_replace_empty_pattern():


test_replace_empty_pattern()


def test_expandtabs_zero_tabsize():
# With no width to advance to, the tabs come out and nothing else moves.
# A tab that followed a character used to ask for a run of usize::MAX
# spaces and take the interpreter down with it.
for tabsize in (0, -1, -8):
assert "a\tb".expandtabs(tabsize) == "ab"
assert "ab\tcd\tef".expandtabs(tabsize) == "abcdef"
assert "a\nb\tc".expandtabs(tabsize) == "a\nbc"
assert "a\r\nb\tc".expandtabs(tabsize) == "a\r\nbc"
assert "á\tb".expandtabs(tabsize) == "áb"
assert "😀\tb".expandtabs(tabsize) == "😀b"
assert "\ta".expandtabs(tabsize) == "a"
assert "\t".expandtabs(tabsize) == ""
assert "".expandtabs(tabsize) == ""
assert "no tabs".expandtabs(tabsize) == "no tabs"
assert b"a\tb".expandtabs(tabsize) == b"ab"
assert bytearray(b"a\tb").expandtabs(tabsize) == bytearray(b"ab")

# A tab size that is actually there keeps working.
assert "a\tb".expandtabs(8) == "a b"
assert "a\tb".expandtabs(1) == "a b"
assert "abcd\te".expandtabs(4) == "abcd e"
assert "a\nb\tc".expandtabs(4) == "a\nb c"


test_expandtabs_zero_tabsize()
Loading

Back | FazBrowse Home | New Git URL