Use the correct ByteList when calculating string lengths.

nirvdrum · nirvdrum · commit 9e53642bce94 · 2015-01-05T14:22:55.000-05:00
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -360,7 +360,7 @@ private int strLength(ByteList bytes) {
     }
 
     private int strLength(ByteList bytes, Encoding enc) {
-        if (isCodeRangeValid() && enc instanceof UTF8Encoding) return StringSupport.utf8Length(value);
+        if (isCodeRangeValid() && enc instanceof UTF8Encoding) return StringSupport.utf8Length(bytes);
 
         long lencr = strLengthWithCodeRange(bytes, enc);
         int cr = unpackArg(lencr);

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ private int strLength(ByteList bytes) {`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`private int strLength(ByteList bytes, Encoding enc) {`
`363`		`- if (isCodeRangeValid() && enc instanceof UTF8Encoding) return StringSupport.utf8Length(value);`
	`363`	`+ if (isCodeRangeValid() && enc instanceof UTF8Encoding) return StringSupport.utf8Length(bytes);`
`364`	`364`
`365`	`365`	`long lencr = strLengthWithCodeRange(bytes, enc);`
`366`	`366`	`int cr = unpackArg(lencr);`