archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 43685,43690,43705: [Backport #9110]

Browse source 
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-12-21 14:51:01 +00:00
parent 2f4529e7a6
commit 787a90cdc5
4 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Sat Dec 21 23:13:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@gmail.com>
* 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@ruby-lang.org> Sat Dec 21 22:55:03 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not * lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not

12
eval_jump.c
View file

@ -96,7 +96,8 @@ rb_mark_end_proc(void)
void void
rb_exec_end_proc(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; int status;
volatile int safe = rb_safe_level(); volatile int safe = rb_safe_level();
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
@ -105,6 +106,9 @@ rb_exec_end_proc(void)
while (ephemeral_end_procs) { while (ephemeral_end_procs) {
link = ephemeral_end_procs; link = ephemeral_end_procs;
ephemeral_end_procs = link->next; ephemeral_end_procs = link->next;
endproc = *link;
xfree((void *)link);
link = &endproc;
PUSH_TAG(); PUSH_TAG();
if ((status = EXEC_TAG()) == 0) { if ((status = EXEC_TAG()) == 0) {
@ -116,12 +120,14 @@ rb_exec_end_proc(void)
error_handle(status); error_handle(status);
if (!NIL_P(th->errinfo)) errinfo = th->errinfo; if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
} }
xfree(link);
} }
while (end_procs) { while (end_procs) {
link = end_procs; link = end_procs;
end_procs = link->next; end_procs = link->next;
endproc = *link;
xfree((void *)link);
link = &endproc;
PUSH_TAG(); PUSH_TAG();
if ((status = EXEC_TAG()) == 0) { if ((status = EXEC_TAG()) == 0) {
@ -133,8 +139,8 @@ rb_exec_end_proc(void)
error_handle(status); error_handle(status);
if (!NIL_P(th->errinfo)) errinfo = th->errinfo; if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
} }
xfree(link);
} }
rb_set_safe_level_force(safe); rb_set_safe_level_force(safe);
th->errinfo = errinfo; th->errinfo = errinfo;
} }

11
test/ruby/test_beginendblock.rb
View file

@ -167,4 +167,15 @@ EOW
assert_equal(["", "", 42], [out, err, status.exitstatus], "#{bug5218}: #{ex}") assert_equal(["", "", 42], [out, err, status.exitstatus], "#{bug5218}: #{ex}")
end end
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 end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-12-21" #define RUBY_RELEASE_DATE "2013-12-21"
#define RUBY_PATCHLEVEL 368 #define RUBY_PATCHLEVEL 369
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12