[Truffle] Fixed an indexing issue into a ByteList.

jruby · Jun 25, 2015 · e8cc0d9 · e8cc0d9
1 parent bbdcc94
commit e8cc0d9
Showing 1 changed file with 3 additions and 3 deletions.
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
@@ -232,12 +232,12 @@ public Object stringByteSubstring(RubyString string, int index, int length) {
                 rangeEnd = bytes.length();
             }
 
-            if (normalizedIndex < bytes.getBegin()) {
+            if (normalizedIndex + bytes.begin() < bytes.begin()) {
                 return nil();
             }
 
-            final byte[] copiedBytes = Arrays.copyOfRange(bytes.getUnsafeBytes(), normalizedIndex, rangeEnd);
-            final RubyBasicObject result = StringNodes.createString(string.getLogicalClass(), new ByteList(copiedBytes, StringNodes.getByteList(string).getEncoding()));
+            final byte[] copiedBytes = Arrays.copyOfRange(bytes.getUnsafeBytes(), normalizedIndex + bytes.begin(), rangeEnd + bytes.begin());
+            final RubyBasicObject result = StringNodes.createString(string.getLogicalClass(), new ByteList(copiedBytes, bytes.getEncoding()));
 
             return taintResultNode.maybeTaint(string, result);
         }