Properly get one-byte bytelists from cache when indexing with byte

Fixes #1361.
jruby · Feb 21, 2014 · 9cb8243 · 9cb8243
1 parent 669017a
commit 9cb8243
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -7338,7 +7338,7 @@ private IRubyObject each_charCommon19(ThreadContext context, Block block) {
             int n = is7bit ? 1 : StringSupport.length(enc, bytes, p, end);
             RubyString str;
             if (n == 1 && isUSASCII) {
-                str = newStringShared(runtime, RubyFixnum.SINGLE_CHAR_BYTELISTS19[bytes[p]], StringSupport.CR_7BIT);
+                str = newStringShared(runtime, RubyFixnum.SINGLE_CHAR_BYTELISTS19[bytes[p] & 0xFF], StringSupport.CR_7BIT);
             } else {
                 str = makeShared19(runtime, val, p-value.getBegin(), n);
             }

diff --git a/spec/regression/GH-1361_ascii_string_with_high_bytes_each_char_spec.rb b/spec/regression/GH-1361_ascii_string_with_high_bytes_each_char_spec.rb
@@ -0,0 +1,10 @@
+describe "An ASCII string with high-range bytes" do
+  it "can each_char through the high bytes successfully" do
+    ary = []
+    str = "M\xA1xico".force_encoding("ASCII")
+    str.each_char {|c| ary << c}
+
+    expect(ary.length).to eq 6
+    expect(ary).to eq(['M', "\xA1", 'x', 'i', 'c', 'o'])
+  end
+end unless RUBY_VERSION < '1.9'