@@ -58,7 +58,6 @@ import org.jruby.RubyObject; import org.jruby.RubyObjectAdapter; import org.jruby.RubyString; import org.jruby.anno.JRubyMethod; -import org.jruby.exceptions.RaiseException; import org.jruby.javasupport.JavaEmbedUtils; import org.jruby.runtime.Arity; import org.jruby.runtime.Block; @@ -414,6 +413,9 @@ public class SSLSocket extends RubyObject { if(len == 0) { return str; } + if (len < 0) { + throw runtime.newArgumentError("negative string size (or size too big)"); + } // So we need to make sure to only block when there is no data left to process if(engine == null || !(peerAppData.hasRemaining() || peerNetData.position() > 0)) { src/java/org/jruby/ext/openssl/SSLSocket.java @@ -169,6 +169,8 @@ class OpenSSL::TestSSL < Test::Unit::TestCase ssl.sync_close = true ssl.connect + assert_raises(ArgumentError) { ssl.sysread(-1) } + # syswrite and sysread ITERATIONS.times{|i| str = "x" * 100 + "\n" test/openssl/test_ssl.rb e9af132782cc980cd5a986584937ffa7b9e5de37 Charles Oliver Nutter headius@headius.com http://github.com/jruby/jruby-openssl/commit/30866643501a93c3daecf0535018c3784ee7c95a 30866643501a93c3daecf0535018c3784ee7c95a 2009-10-27T06:57:09-07:00 2009-10-27T06:57:09-07:00 Possible "fix" for JRUBY-3829: ByteBuffer.java:328:in `allocate': java.lang.IllegalArgumentException when returning SOAP queries over a certain size 24acf697962af805bc2da0e51000adadaa5d4cbb Charles Oliver Nutter headius@headius.com