jruby · Apr 4, 2015 · Apr 4, 2015 · Apr 4, 2015 · Apr 4, 2015
Showing with 25 additions and 6 deletions.

+1 −1 core/src/main/java/org/jruby/RubyString.java

+12 −0 spec/ruby/core/string/shared/chars.rb

+2 −3 spec/truffle/tags/core/string/split_tags.txt

+10 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -4937,7 +4937,7 @@ private IRubyObject enumerateChars(ThreadContext context, String name, Block blo
         Encoding enc;
         RubyArray ary = null;
 
-        str = RubyString.newString(runtime, str.getByteList().dup());
+        str = strDup(runtime);
         ByteList strByteList = str.getByteList();
         ptrBytes = strByteList.unsafeBytes();
         ptr = strByteList.begin();

diff --git a/spec/ruby/core/string/shared/chars.rb b/spec/ruby/core/string/shared/chars.rb
@@ -68,5 +68,17 @@
         "\xA2".force_encoding('SJIS')
       ]
     end
+
+    it "taints resulting strings when self is tainted" do
+      str = "hello"
+
+      str.send(@method) do |x|
+        x.tainted?.should == false
+      end
+
+      str.dup.taint.send(@method) do |x|
+        x.tainted?.should == true
+      end
+    end
   end
 end
diff --git a/spec/truffle/tags/core/string/split_tags.txt b/spec/truffle/tags/core/string/split_tags.txt
@@ -1,3 +1,2 @@
-fails:String#split with String splits on multibyte characters
-fails:String#split with String taints the resulting strings if self is tainted
-fails:String#split with Regexp taints the resulting strings if self is tainted
+fails(regexp):String#split with String splits on multibyte characters
+fails(regexp):String#split with Regexp taints the resulting strings if self is tainted
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -1100,14 +1100,15 @@ public RubyString eachByte(VirtualFrame frame, RubyString string, RubyProc block
     @ImportGuards(StringGuards.class)
     public abstract static class EachCharNode extends YieldingCoreMethodNode {
 
-        @Child private CallDispatchHeadNode toEnumNode;
+        @Child private TaintResultNode taintResultNode;
 
         public EachCharNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
         public EachCharNode(EachCharNode prev) {
             super(prev);
+            taintResultNode = prev.taintResultNode;
         }
 
         @Specialization(guards = "isValidOr7BitEncoding")
@@ -1170,7 +1171,14 @@ private Object substr(RubyString string, int beg, int len) {
             final ByteList substringBytes = new ByteList(bytes, beg, end - beg);
             substringBytes.setEncoding(bytes.getEncoding());
 
-            return getContext().makeString(string.getLogicalClass(), substringBytes);
+            if (taintResultNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                taintResultNode = insert(new TaintResultNode(getContext(), getSourceSection(), true, new int[]{}));
+            }
+
+            final RubyString ret = getContext().makeString(string.getLogicalClass(), substringBytes);
+
+            return taintResultNode.maybeTaint(string, ret);
         }
     }