Fix: String#gsub replacing ascii chars to work in non-ascii string (#…

…5350) Fixes #5348
crystal-lang · Jan 1, 2018 · d7273c7 · d7273c7
1 parent 00880be
commit d7273c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/spec/std/string_spec.cr b/spec/std/string_spec.cr
@@ -1248,6 +1248,10 @@ describe "String" do
       s.gsub('x', "yz").should be(s)
     end
 
+    it "gsubs char with char in non-ascii string" do
+      "/ä".gsub('/', '-').should eq("-ä")
+    end
+
     it "gsubs char with string depending on the char" do
       replaced = "foobar".gsub do |char|
         case char

diff --git a/src/string.cr b/src/string.cr
@@ -2026,12 +2026,12 @@ class String
 
   private def gsub_ascii_char(char, replacement)
     String.new(bytesize) do |buffer|
-      each_char_with_index do |my_char, i|
-        buffer[i] = if my_char == char
-                      replacement.ord.to_u8
-                    else
-                      unsafe_byte_at(i)
-                    end
+      to_slice.each_with_index do |byte, i|
+        if char.ord == byte
+          buffer[i] = replacement.ord.to_u8
+        else
+          buffer[i] = byte
+        end
       end
       {bytesize, bytesize}
     end