1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by

'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
  on IA64.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-13 11:10:46 +00:00
parent 7987f38467
commit 719841ca37
2 changed files with 9 additions and 0 deletions

View file

@ -1,3 +1,9 @@
Thu Dec 13 20:09:09 2007 Tanaka Akira <akr@fsij.org>
* eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by
'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
on IA64.
Thu Dec 13 17:51:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_split_m): need not to check encoding if regexp

3
eval.c
View file

@ -1182,7 +1182,10 @@ rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state)
PUSH_TAG();
th->trap_tag = &trap_tag;
if ((status = EXEC_TAG()) == 0) {
rb_jmpbuf_t org_jmpbuf;
MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
}
th->trap_tag = trap_tag.prev;
POP_TAG();