diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-06 09:00:21 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-06 09:00:21 +0000 |
commit | 10d948f59fdb496f68d1ebad23eae93cb12fb689 (patch) | |
tree | 5fb9b7ba1ed0f8fdf1115b90b4cd8419e5242579 /ext/tk | |
parent | e0785135854570722e01a5bd690911945dad8651 (diff) | |
download | ruby-10d948f59fdb496f68d1ebad23eae93cb12fb689.tar.gz |
* ext/tk/tcltklib.c: removed deprecated safe level.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r-- | ext/tk/tcltklib.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index f082d3922f..afcee3b072 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -3039,7 +3039,7 @@ lib_do_one_event_core(argc, argv, self, is_ip) flags = FIX2INT(vflags); } - if (rb_safe_level() >= 4 || (rb_safe_level() >=1 && OBJ_TAINTED(vflags))) { + if (rb_safe_level() >=1 && OBJ_TAINTED(vflags)) { flags |= TCL_DONT_WAIT; } @@ -3750,7 +3750,7 @@ ip_RubyExitCommand(clientData, interp, argc, argv) Tcl_ResetResult(interp); - if (rb_safe_level() >= 4 || Tcl_IsSafe(interp)) { + if (Tcl_IsSafe(interp)) { if (!Tcl_InterpDeleted(interp)) { ip_finalize(interp); @@ -6125,13 +6125,6 @@ ip_init(argc, argv, self) int with_tk = 1; Tk_Window mainWin = (Tk_Window)NULL; - /* security check */ - if (rb_safe_level() >= 4) { - rb_raise(rb_eSecurityError, - "Cannot create a TclTkIp object at level %d", - rb_safe_level()); - } - /* create object */ TypedData_Get_Struct(self, struct tcltkip, &tcltkip_type, ptr); if (DATA_PTR(self)) { |