[Truffle] Fixed a bad offset in the 'string_chr_at' primitive.

jruby · Mar 31, 2015 · 2b4851a · 2b4851a
1 parent 46a29c2
commit 2b4851a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/spec/truffle/tags/core/string/chomp_tags.txt b/spec/truffle/tags/core/string/chomp_tags.txt
@@ -1,6 +1,4 @@
-fails:String#chomp removes the final carriage return, newline from a multibyte String
 fails:String#chomp removes the final carriage return, newline from a non-ASCII String
 fails:String#chomp removes the final carriage return, newline from a non-ASCII String when the record separator is changed
-fails:String#chomp! removes the final carriage return, newline from a multibyte String
 fails:String#chomp! removes the final carriage return, newline from a non-ASCII String
 fails:String#chomp! removes the final carriage return, newline from a non-ASCII String when the record separator is changed
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
@@ -328,8 +328,8 @@ public Object stringChrAt(RubyString string, int byteIndex) {
                 return nil();
             }
 
-            final int p = bytes.getBegin();
-            final int end = p + bytes.getRealSize();
+            final int p = bytes.getBegin() + byteIndex;
+            final int end = bytes.getBegin() + bytes.getRealSize();
             final int c = StringSupport.preciseLength(bytes.getEncoding(), bytes.getUnsafeBytes(), p, end);
 
             if (! StringSupport.MBCLEN_CHARFOUND_P(c)) {