timeout.rb: skip rescue

* lib/timeout.rb (Timeout#timeout): should not be caught by rescue
  clause.  [Bug #8730]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 41 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 00bbc9d7fa..b1c05dedbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 26 15:27:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): should not be caught by rescue
+	  clause.  [Bug #8730]
+
 Mon Aug 26 14:44:26 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* array.c (rb_ary_splice): use RARRAY_PTR_USE() without WB because
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 284305bcca..97af8547f4 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -26,6 +26,18 @@ module Timeout
   class Error < RuntimeError
   end
   class ExitException < ::Exception # :nodoc:
+    attr_reader :klass, :thread
+
+    def initialize(*)
+      super
+      @thread = Thread.current
+      freeze
+    end
+
+    def exception(*)
+      throw(self, caller) if self.thread == Thread.current
+      self
+    end
   end
 
   # :stopdoc:
@@ -50,8 +62,7 @@ module Timeout
   # a module method, so you can call it directly as Timeout.timeout().
   def timeout(sec, klass = nil)   #:yield: +sec+
     return yield(sec) if sec == nil or sec.zero?
-    exception = klass || Class.new(ExitException)
-    begin
+    bt = catch(ExitException.new) do |exception|
       begin
         x = Thread.current
         y = Thread.start {
@@ -60,7 +71,8 @@ module Timeout
           rescue => e
             x.raise e
           else
-            x.raise exception, "execution expired"
+            # no message, not to make new instance.
+            x.raise exception
           end
         }
         return yield(sec)
@@ -70,18 +82,14 @@ module Timeout
           y.join # make sure y is dead.
         end
       end
-    rescue exception => e
-      rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
-      (bt = e.backtrace).reject! {|m| rej =~ m}
-      level = -caller(CALLER_OFFSET).size
-      while THIS_FILE =~ bt[level]
-        bt.delete_at(level)
-        level += 1
-      end
-      raise if klass            # if exception class is specified, it
-                                # would be expected outside.
-      raise Error, e.message, e.backtrace
     end
+    rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
+    bt.reject! {|m| rej =~ m}
+    level = -caller(CALLER_OFFSET).size
+    while THIS_FILE =~ bt[level]
+      bt.delete_at(level)
+    end
+    raise((klass||Error), "execution expired", bt)
   end
 
   module_function :timeout
diff --git a/test/test_timeout.rb b/test/test_timeout.rb
index 57eca3e478..4c6065c232 100644
--- a/test/test_timeout.rb
+++ b/test/test_timeout.rb
@@ -29,4 +29,18 @@ class TestTimeout < Test::Unit::TestCase
     def (n = Object.new).zero?; false; end
     assert_raise(TypeError, bug3168) {Timeout.timeout(n) { sleep 0.1 }}
   end
+
+  def test_skip_rescue
+    bug8730 = '[Bug #8730]'
+    e = nil
+    assert_raise(Timeout::Error, bug8730) do
+      timeout 0.1 do
+        begin
+          sleep 3
+        rescue Exception => e
+        end
+      end
+    end
+    assert_nil(e, bug8730)
+  end
 end