[GR-18163] Fixed String#{chomp, chomp!} issue with invalid encoded strings

PullRequest: truffleruby/2122

Author: bjfish

CHANGELOG.md

@@ -8,6 +8,7 @@ Bug fixes:
 * Fix error message when the method name is not a Symbol or String for `Kernel#respond_to?` (#2132, @ssnickolay)
 * Fixed setting of special variables in enumerators and enumerables (#1484).
 * Fix status and output when SystemExit is subclassed and raised (#2128)
+* Fix `String#{chomp, chomp!}` issue with invalid encoded strings (#2133).
 
 Compatibility:
 

spec/ruby/core/string/chomp_spec.rb

@@ -55,6 +55,10 @@
       $/ = "cdef"
       "abcdef".chomp.should == "ab"
     end
+
+    it "removes one trailing newline for string with invalid encoding" do
+      "\xa0\xa1\n".chomp.should == "\xa0\xa1"
+    end
   end
 
   describe "when passed nil" do
@@ -108,6 +112,10 @@
     it "returns an empty String when self is empty" do
       "".chomp("").should == ""
     end
+
+    it "removes one trailing newline for string with invalid encoding" do
+      "\xa0\xa1\n".chomp("").should == "\xa0\xa1"
+    end
   end
 
   describe "when passed '\\n'" do

src/main/ruby/truffleruby/core/string.rb

@@ -826,7 +826,7 @@ def chomp!(sep=undefined)
         if j = Primitive.string_previous_byte_index(self, bytes)
           chr = Primitive.string_chr_at(self, j)
 
-          if chr.ord == 13
+          if !Primitive.nil?(chr) && chr.ord == 13
             bytes = j
           end
         end
@@ -839,13 +839,13 @@ def chomp!(sep=undefined)
 
       while i = Primitive.string_previous_byte_index(self, bytes)
         chr = Primitive.string_chr_at(self, i)
-        break unless chr.ord == 10
+        break unless !Primitive.nil?(chr) && chr.ord == 10
 
         bytes = i
 
         if j = Primitive.string_previous_byte_index(self, i)
           chr = Primitive.string_chr_at(self, j)
-          if chr.ord == 13
+          if !Primitive.nil?(chr) && chr.ord == 13
             bytes = j
           end
         end