diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-09-03 07:43:53 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-09-03 07:43:53 +0000 |
commit | f5da3b6746dba18ab86d11aa49caf97b37ecc6ac (patch) | |
tree | 1c472d11ebd04c612140d228a7a5414d3a08e615 /eval.c | |
parent | 264c52f2e6abc33f09e6a891f67bdf7bddbae406 (diff) |
1.1c4
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -704,8 +704,10 @@ rb_check_safe_str(x) Raise(eSecurityError, "Insecure operation - %s", rb_id2name(the_frame->last_func)); } - Warning("Insecure operation - %s", - rb_id2name(the_frame->last_func)); + if (verbose) { + Warning("Insecure operation - %s", + rb_id2name(the_frame->last_func)); + } } } @@ -6124,7 +6126,7 @@ thread_sleep_forever() { if (curr_thread == curr_thread->next) { TRAP_BEG; - sleep((32767<<16)+32767); + sleep((32767L<<16)+32767); TRAP_END; return; } @@ -6466,7 +6468,8 @@ thread_raise(argc, argv, thread) f_raise(argc, argv); } - thread_save_context(curr_thread); + if (curr_thread->status != THREAD_KILLED) + thread_save_context(curr_thread); if (setjmp(curr_thread->context)) { return thread; } |