nagachika	2013-12-21 23:51:01 +0900 (Sat, 21 Dec 2013)

  New Revision: 44325

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44325

  Log:
    merge revision(s) 43685,43690,43705: [Backport #9110]
    
    * eval_jump.c (rb_exec_end_proc): fix double free or corruption error
      when reentering by callcc. [ruby-core:58329] [Bug #9110]
    
    * test/ruby/test_beginendblock.rb: test for above.
    
    * eval_jump.c (rb_exec_end_proc): unlink and free procs data before
      calling for each procs.  [Bug #9110]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/eval_jump.c
    branches/ruby_2_0_0/test/ruby/test_beginendblock.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44324)
+++ ruby_2_0_0/ChangeLog	(revision 44325)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Dec 21 23:13:55 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval_jump.c (rb_exec_end_proc): unlink and free procs data before
+	  calling for each procs.  [Bug #9110]
+
+Sat Dec 21 23:13:55 2013  Masaki Matsushita  <glass.saga@g...>
+
+	* eval_jump.c (rb_exec_end_proc): fix double free or corruption error
+	  when reentering by callcc. [ruby-core:58329] [Bug #9110]
+
+	* test/ruby/test_beginendblock.rb: test for above.
+
 Sat Dec 21 22:55:03 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
Index: ruby_2_0_0/eval_jump.c
===================================================================
--- ruby_2_0_0/eval_jump.c	(revision 44324)
+++ ruby_2_0_0/eval_jump.c	(revision 44325)
@@ -96,7 +96,8 @@ rb_mark_end_proc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/eval_jump.c#L96
 void
 rb_exec_end_proc(void)
 {
-    struct end_proc_data *volatile link;
+    struct end_proc_data volatile endproc;
+    struct end_proc_data volatile *link;
     int status;
     volatile int safe = rb_safe_level();
     rb_thread_t *th = GET_THREAD();
@@ -105,6 +106,9 @@ rb_exec_end_proc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/eval_jump.c#L106
     while (ephemeral_end_procs) {
 	link = ephemeral_end_procs;
 	ephemeral_end_procs = link->next;
+	endproc = *link;
+	xfree((void *)link);
+	link = &endproc;
 
 	PUSH_TAG();
 	if ((status = EXEC_TAG()) == 0) {
@@ -116,12 +120,14 @@ rb_exec_end_proc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/eval_jump.c#L120
 	    error_handle(status);
 	    if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
 	}
-	xfree(link);
     }
 
     while (end_procs) {
 	link = end_procs;
 	end_procs = link->next;
+	endproc = *link;
+	xfree((void *)link);
+	link = &endproc;
 
 	PUSH_TAG();
 	if ((status = EXEC_TAG()) == 0) {
@@ -133,8 +139,8 @@ rb_exec_end_proc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/eval_jump.c#L139
 	    error_handle(status);
 	    if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
 	}
-	xfree(link);
     }
+
     rb_set_safe_level_force(safe);
     th->errinfo = errinfo;
 }
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44324)
+++ ruby_2_0_0/version.h	(revision 44325)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-12-21"
-#define RUBY_PATCHLEVEL 368
+#define RUBY_PATCHLEVEL 369
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 12
Index: ruby_2_0_0/test/ruby/test_beginendblock.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_beginendblock.rb	(revision 44324)
+++ ruby_2_0_0/test/ruby/test_beginendblock.rb	(revision 44325)
@@ -167,4 +167,15 @@ EOW https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_beginendblock.rb#L167
       assert_equal(["", "", 42], [out, err, status.exitstatus], "#{bug5218}: #{ex}")
     end
   end
+
+  def test_callcc_at_exit
+    bug9110 = '[ruby-core:58329][Bug #9110]'
+    script = <<EOS
+require "continuation"
+c = nil
+at_exit { c.call }
+at_exit { callcc {|_c| c = _c } }
+EOS
+    assert_normal_exit(script, bug9110)
+  end
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43685,43690,43705


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/