Fix UDPSocket#(send|write) to raise EMSGSIZE (#4608)

* Fix UDPSocket#send msg size error. Relates to #4606 * Add UDPSocket#send EMSGSIZE spec. Relates to #4606 * Fix UDPSocket#write msg size error. Fixes #4606 * Add UDPSocket#write EMSGSIZE spec. Relates to #4606
jruby · May 24, 2017 · b04be74 · b04be74
1 parent 205504b
commit b04be74
Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -3709,6 +3709,10 @@ public RaiseException newErrnoENETUNREACHError() {
         return newRaiseException(getErrno().getClass("ENETUNREACH"), null);
     }
 
+    public RaiseException newErrnoEMSGSIZEError() {
+        return newRaiseException(getErrno().getClass("EMSGSIZE"), null);
+    }
+
     public RaiseException newIndexError(String message) {
         return newRaiseException(getIndexError(), message);
     }

diff --git a/core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
@@ -430,6 +430,13 @@ public IRubyObject send(ThreadContext context, IRubyObject[] args) {
         } catch (UnknownHostException e) {
             throw SocketUtils.sockerr(runtime, "send: name or service not known");
         } catch (IOException e) { // SocketException
+            final String message = e.getMessage();
+            if (message != null) {
+                switch(message) {
+                case "Message too long":
+                    throw runtime.newErrnoEMSGSIZEError();
+                }
+            }
             throw runtime.newIOErrorFromException(e);
         }
         catch (RaiseException e) { throw e; }

diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -276,6 +276,7 @@ public static Errno errnoFromException(Throwable t) {
 
                 case "No space left on device" : return Errno.ENOSPC;
                 case "Too many open files" : return Errno.EMFILE;
+                case "Message too long" : return Errno.EMSGSIZE;
             }
             if (Platform.IS_WINDOWS && errorMessage.contains("connection was aborted")) return Errno.ECONNRESET;
         }

diff --git a/spec/ruby/library/socket/udpsocket/send_spec.rb b/spec/ruby/library/socket/udpsocket/send_spec.rb
@@ -5,16 +5,19 @@
   before :each do
     @ready = false
     @server_thread = Thread.new do
-      @server = UDPSocket.open
-      @server.bind(nil, SocketSpecs.port)
-      @ready = true
       begin
-        @msg = @server.recvfrom_nonblock(64)
-      rescue IO::WaitReadable
-        IO.select([@server])
-        retry
+        @server = UDPSocket.open
+        @server.bind(nil, SocketSpecs.port)
+        @ready = true
+        begin
+          @msg = @server.recvfrom_nonblock(64)
+        rescue IO::WaitReadable
+          IO.select([@server])
+          retry
+        end
+      ensure
+        @server.close if @server && !@server.closed?
       end
-      @server.close
     end
     Thread.pass while @server_thread.status and !@ready
   end
@@ -55,4 +58,15 @@
     @msg[1][1].should be_kind_of(Fixnum)
     @msg[1][3].should == "127.0.0.1"
   end
+
+  it "raises EMSGSIZE if data is too too big" do
+    @socket = UDPSocket.open
+
+    lambda do
+      @socket.send('1' * 100_000, 0, SocketSpecs.hostname, SocketSpecs.str_port)
+    end.should raise_error(Errno::EMSGSIZE)
+
+    @socket.close
+    @server_thread.exit
+  end
 end
diff --git a/spec/ruby/library/socket/udpsocket/write_spec.rb b/spec/ruby/library/socket/udpsocket/write_spec.rb
@@ -0,0 +1,21 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+
+describe "UDPSocket#write" do
+  it "raises EMSGSIZE if msg is too long" do
+    begin
+      host, port = SocketSpecs.hostname, SocketSpecs.port
+      s1 = UDPSocket.new
+      s1.bind(host, port)
+      s2 = UDPSocket.new
+      s2.connect(host, port)
+
+      lambda do
+        s2.write('1' * 100_000)
+      end.should raise_error(Errno::EMSGSIZE)
+    ensure
+      s1.close if s1 && !s1.closed?
+      s2.close if s2 && !s2.closed?
+    end
+  end
+end