fix empty case in chopsuffix

JuliaLang · May 29, 2021 · 8457935 · 8457935
1 parent 7f1f36c
commit 8457935
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/base/strings/util.jl b/base/strings/util.jl
@@ -242,10 +242,10 @@ julia> chopsuffix("Hamburger", "hotdog")
 ```
 """
 function chopsuffix(s::AbstractString, suffix::AbstractString)
-    if endswith(s, suffix)
-        SubString(s, firstindex(s), prevind(s, lastindex(s), length(suffix)))
-    else
+    if isempty(s) || !endswith(s, suffix)
         SubString(s)
+    else
+        SubString(s, firstindex(s), prevind(s, lastindex(s), length(suffix)))
     end
 end
 

diff --git a/test/strings/util.jl b/test/strings/util.jl
@@ -355,6 +355,7 @@ end
     @test chopprefix("εfoo", "ε") == "foo"
     @test chopprefix("ofoε", "o") == "foε"
     @test chopprefix("∃∃∃∃", "∃") == "∃∃∃"
+    @test chopprefix("∃∃∃∃", "") == "∃∃∃∃"
 
     @test chopsuffix("fo∀\n", "bog") == "fo∀\n"
     @test chopsuffix("fo∀\n", "\n∀foΔ") == "fo∀\n"
@@ -376,6 +377,7 @@ end
     @test chopsuffix("fooε", "ε") == "foo"
     @test chopsuffix("εofo", "o") == "εof"
     @test chopsuffix("∃∃∃∃", "∃") == "∃∃∃"
+    @test chopsuffix("∃∃∃∃", "") == "∃∃∃∃"
 
     @test isa(chomp("foo"), SubString)
     @test isa(chop("foo"), SubString)