Skip to content

Commit

Permalink
fixes #495
Browse files Browse the repository at this point in the history
Xerces will close the InputSource which closes the InputStream of the RubyIO
that was passed to Nokogiri::XML. This closes the underlying FileDescriptor
that is maintained internally by JRuby while the RubyIO object is still
referencing it, which causes a BadFileDescriptor when RubyIO#close is called.
  • Loading branch information
jvshahid committed Nov 9, 2012
1 parent b5c1d9d commit f75a283
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ext/java/nokogiri/internals/ParserContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public void setInputSource(ThreadContext context, IRubyObject data, IRubyObject
(RubyIO) TypeConverter.convertToType(data,
ruby.getIO(),
"to_io");
source.setByteStream(io.getInStream());
// use unclosedable input stream to fix #495
source.setByteStream(new UncloseableInputStream(io.getInStream()));
} else {
if (invoke(context, data, "respond_to?",
ruby.newSymbol("string").to_sym()).isTrue()) {
Expand Down
102 changes: 102 additions & 0 deletions ext/java/nokogiri/internals/UncloseableInputStream.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/**
* (The MIT License)
*
* Copyright (c) 2008 - 2012:
*
* * {Aaron Patterson}[http://tenderlovemaking.com]
* * {Mike Dalessio}[http://mike.daless.io]
* * {Charles Nutter}[http://blog.headius.com]
* * {Sergio Arbeo}[http://www.serabe.com]
* * {Patrick Mahoney}[http://polycrystal.org]
* * {Yoko Harada}[http://yokolet.blogspot.com]
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* 'Software'), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package nokogiri.internals;

import java.io.IOException;
import java.io.InputStream;

/**
* Delegates all the methods to another InputStream except the
* close() method, which is ignored. This is used to fix #495.
*
* @author John Shahid <jvshahid@gmail.com>
*/
public class UncloseableInputStream extends InputStream {
private final InputStream delegate;

/**
* Create a new uncloseable stream.
*
* @param delegate The InputStream to which all methods (except close)
* will be delegated.
*/
public UncloseableInputStream(InputStream delegate) {
this.delegate = delegate;
}

@Override
public int read() throws IOException {
return delegate.read();
}

@Override
public int read(byte []b) throws IOException {
return delegate.read(b);
}

@Override
public int read(byte []b, int offset, int len) throws IOException {
return delegate.read(b, offset, len);
}

@Override
public long skip(long n) throws IOException {
return delegate.skip(n);
}

@Override
public int available() throws IOException {
return delegate.available();
}

@Override
public void close() {
// don't forward this to the InputStream we're delegating from
// we don't want the InputStream of the RubyIO to be closed
}

@Override
public void mark(int readlimit) {
delegate.mark(readlimit);
}

@Override
public void reset() throws IOException {
delegate.reset();
}

@Override
public boolean markSupported() {
return delegate.markSupported();
}
}
6 changes: 6 additions & 0 deletions test/xml/test_document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,12 @@ def test_add_child
doc = wrap_java_document
doc.root.add_child "<bar />"
end

def test_can_be_closed
f = File.open XML_FILE
Nokogiri::XML f
f.close
end
end
end
end

0 comments on commit f75a283

Please sign in to comment.