cool.io 1.9.5 → 1.10.0

data/ext/libev/ev_wrap.h

@@ -98,6 +98,8 @@
 #define vec_ro ((loop)->vec_ro)
 #define vec_wi ((loop)->vec_wi)
 #define vec_wo ((loop)->vec_wo)
+#define win32_fs ((loop)->win32_fs)
+#define win32_fs_disabled ((loop)->win32_fs_disabled)
 #else
 #undef EV_WRAP_H
 #undef acquire_cb
@@ -197,4 +199,6 @@
 #undef vec_ro
 #undef vec_wi
 #undef vec_wo
+#undef win32_fs
+#undef win32_fs_disabled
 #endif

data/lib/cool.io/dns_resolver.rb

@@ -218,6 +218,7 @@ module Coolio
       while not message.empty?
         type = message[2..3].unpack('n').first.to_i
         rdlength = message[10..11].unpack('n').first.to_i
+        return if message.bytesize < 12 + rdlength
         rdata = message[12..(12 + rdlength - 1)]
         message.slice!(0, 12 + rdlength)
 

data/lib/cool.io/loop.rb

@@ -38,6 +38,10 @@ module Coolio
     #     :kqueue (BSD/Mac OS X)
     #     :port   (Solaris 10)
     #
+    # Raises RuntimeError if none of the selected backends is usable.
+    # Unless :skip_environment is true, $LIBEV_FLAGS can override the
+    # backend selection and cause the same error.
+    #
     def initialize(options = {})
       @watchers = {}
       @active_watchers = 0
@@ -47,7 +51,7 @@ module Coolio
       options.each do |option, value|
         case option
         when :skip_environment
-          flags |= EVFLAG_NOEV if value
+          flags |= EVFLAG_NOENV if value
         when :fork_check
           flags |= EVFLAG_FORKCHECK if value
         when :backend

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.9.5"
+  VERSION = "1.10.0"
 
   def self.version
     VERSION

data/spec/detach_race_condition_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Cool.io::Loop do
-  # An IOWatcher that drains its pipe and then runs a user-supplied block,
+  # An IOWatcher that drains its socket and then runs a user-supplied block,
   # receiving itself as the argument.
   class Victim < Cool.io::IOWatcher
     def initialize(io, &on_readable)
@@ -34,16 +34,21 @@ describe Cool.io::Loop do
   # crashed intermittently on macOS.
   it "does not raise when a watcher with a pending event is detached during dispatch" do
     iterations = 200
+    # Winsock select monitors sockets, not IO.pipe handles. TCP connections
+    # exercise the same queued-event scenario on every supported platform.
+    listener = TCPServer.new('127.0.0.1', 0)
 
-    expect {
-      iterations.times do
-        coolio_loop = Cool.io::Loop.new
-        pipes = []
-        watchers = []
+    iterations.times do
+      coolio_loop = Cool.io::Loop.new
+      connections = []
+      watchers = []
 
+      begin
         5.times do
-          r, w = IO.pipe
-          pipes << [r, w]
+          w = TCPSocket.new('127.0.0.1', listener.addr[1])
+          connections << [nil, w]
+          r = listener.accept
+          connections.last[0] = r
 
           watcher = Victim.new(r) do |fired|
             # Detach every other watcher whose event is already queued for this
@@ -58,16 +63,23 @@ describe Cool.io::Loop do
           w.write("dummy\n") # make the read end readable so an event is pending
         end
 
+        # TCP delivery is asynchronous. Ensure all five read ends are ready
+        # before libev collects the events, without consuming their data.
+        connections.each do |r, _|
+          expect(IO.select([r], nil, nil, 2)).not_to be_nil
+        end
         coolio_loop.run_once
 
         # Only the first dispatched watcher runs; it detaches the other four,
         # whose pending events are then skipped.
         expect(watchers.count(&:attached?)).to eq(1)
-
+      ensure
         watchers.each { |watcher| watcher.detach if watcher.attached? }
-        pipes.each { |r, w| r.close; w.close }
+        connections.each { |r, w| r.close if r; w.close }
       end
-    }.not_to raise_error
+    end
+  ensure
+    listener.close if listener
   end
 
   class HttpHandler < Coolio::IO

data/spec/dns_spec.rb

@@ -211,6 +211,17 @@ describe "DNS" do
       resolver.__send__(:on_readable)
     end
 
+    it "fails a response whose A record is shorter than its RDLENGTH instead of resolving a bogus address" do
+      truncated = dns_response_for(resolver, address: "1.2.3.4")[0...-4]
+      allow(resolver.instance_variable_get(:@socket)).to receive(:recvfrom_nonblock).and_return([truncated, sender])
+
+      expect(resolver).to_not receive(:on_success)
+      expect(resolver).to receive(:on_failure)
+      expect(resolver).to receive(:detach)
+
+      resolver.__send__(:on_readable)
+    end
+
     it "ignores a spoofed response instead of resolving or failing it" do
       forged = dns_response_for(resolver, address: "6.6.6.6")
       allow(resolver.instance_variable_get(:@socket)).to receive(:recvfrom_nonblock)