Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17a3c17cac37
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80ec6196f331
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 7, 2014

  1. Always taint StringIO by it input. Fixes ruby-bug 9769.

    @cheald
    cheald committed Nov 7, 2014
    Copy the full SHA
    c40909c View commit details

  2. Merge pull request #2135 from cheald/fix_stringio_infect 

    Always taint StringIO by it input. Fixes ruby-bug 9769.
    @headius
    headius committed Nov 7, 2014
    Copy the full SHA
    80ec619 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/ext/stringio/StringIO.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/stringio/StringIO.java
View file
Original file line number Diff line number Diff line change
@@ -1144,8 +1144,8 @@ public IRubyObject write(ThreadContext context, IRubyObject arg) {
strioExtend(ptr.pos, len);
ByteList ptrByteList = ptr.string.getByteList();
System.arraycopy(str.getByteList().getUnsafeBytes(), str.getByteList().getBegin(), ptrByteList.getUnsafeBytes(), ptrByteList.begin + ptr.pos, len);
ptr.string.infectBy(str);
}
ptr.string.infectBy(str);
ptr.string.infectBy(this);
ptr.pos += len;
return RubyFixnum.newFixnum(runtime, len);