exec_sandbox 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/exec_sandbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "exec_sandbox"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/lib/exec_sandbox/spawn.rb

@@ -65,7 +65,18 @@ module Spawn
     redirected_fds = Set.new redirects.map(&:first)
     max_fd = LibC.getdtablesize
     0.upto(max_fd) do |fd|
-      LibC.close fd unless redirected_fds.include?(fd)
+      next if redirected_fds.include?(fd)
+      
+      # TODO(pwnall): this is slow; consider detecting the Ruby version and
+      #               only running it on buggy MRIs
+      begin
+        # This fails if rb_reserved_fd_p returns 0.
+        # In that case, we shouldn't close the FD, otherwise the VM will crash.
+        IO.new(fd)
+      rescue ArgumentError, Errno::EBADF
+        next
+      end
+      LibC.close fd
     end
   end
   

data/spec/exec_sandbox/spawn_spec.rb

@@ -13,8 +13,20 @@ describe ExecSandbox::Spawn do
       @temp_in.close
       @temp_out = Tempfile.new 'exec_sandbox_rspec'
       @temp_out.close
+      
+      # Force-creating a 2nd thread to make MRI 1.9.3 crash without our fix.
+      @lock = Mutex.new
+      @lock.lock
+      Thread.new do
+        loop do
+          sleep 0.1
+          break if @lock.try_lock
+        end
+        @lock.unlock
+      end
     end
     after do
+      @lock.unlock
       @temp_in.unlink
       @temp_out.unlink
     end
@@ -37,7 +49,8 @@ describe ExecSandbox::Spawn do
     describe 'with paths' do
       before do
         pid = ExecSandbox::Spawn.spawn bin_fixture(:duplicate),
-            {:in => @temp_in.path, :out => @temp_out.path}
+            {:in => @temp_in.path, :out => @temp_out.path,
+             :err => @temp_out.path}
         @status = ExecSandbox::Wait4.wait4 pid
       end
 

data/spec/fixtures/fork.rb

@@ -11,7 +11,9 @@ File.open(ARGV[0], 'wb') do |f|
   0.upto(proc_count - 1) do |i|
     pids[i] = fork do
       f.write '+'
+      f.close
       sleep 1
+      exit
     end
   end
   0.upto(proc_count - 1) { |i| Process.waitpid(pids[i]) }

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'exec_sandbox'
 
+# Spawn tests use threads to test against an MRI 1.9.3 crash.
+require 'thread'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exec_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &16244480 !ruby/object:Gem::Requirement
+  requirement: &25139320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *16244480
+  version_requirements: *25139320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16243600 !ruby/object:Gem::Requirement
+  requirement: &25138680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *16243600
+  version_requirements: *25138680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16242420 !ruby/object:Gem::Requirement
+  requirement: &25138060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *16242420
+  version_requirements: *25138060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16240920 !ruby/object:Gem::Requirement
+  requirement: &25137500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *16240920
+  version_requirements: *25137500
 - !ruby/object:Gem::Dependency
   name: yard-rspec
-  requirement: &16255360 !ruby/object:Gem::Requirement
+  requirement: &25136740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *16255360
+  version_requirements: *25136740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16254280 !ruby/object:Gem::Requirement
+  requirement: &25135940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *16254280
+  version_requirements: *25135940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16253700 !ruby/object:Gem::Requirement
+  requirement: &25119740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *16253700
+  version_requirements: *25119740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16252960 !ruby/object:Gem::Requirement
+  requirement: &25119080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16252960
+  version_requirements: *25119080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16252200 !ruby/object:Gem::Requirement
+  requirement: &25117840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16252200
+  version_requirements: *25117840
 description: Temporary users and groups, rlimits
 email: costan@gmail.com
 executables: []
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3787059974273612193
+      hash: -1493873678505410753
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: