From 48d22f8360cf22f4c2ee8d00d1227af3ed94460f Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 22 Apr 2016 01:43:31 +0000 Subject: [PATCH] * file.c, win32/file.c: Removed obsoleted safe level checks. [fix GH-1327] Patch by @cremno git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 2 +- win32/file.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce5bd18d47..d7744bfad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 22 10:43:19 2016 SHIBATA Hiroshi + + * file.c, win32/file.c: Removed obsoleted safe level checks. + [fix GH-1327] Patch by @cremno + Fri Apr 22 10:01:48 2016 SHIBATA Hiroshi * benchmark/bm_so_meteor_contest.rb: fix a typo. diff --git a/file.c b/file.c index f2e299623f..0b469992d3 100644 --- a/file.c +++ b/file.c @@ -124,7 +124,7 @@ VALUE rb_cFile; VALUE rb_mFileTest; VALUE rb_cStat; -#define insecure_obj_p(obj, level) ((level) >= 4 || ((level) > 0 && OBJ_TAINTED(obj))) +#define insecure_obj_p(obj, level) ((level) > 0 && OBJ_TAINTED(obj)) static VALUE file_path_convert(VALUE name) diff --git a/win32/file.c b/win32/file.c index d1b9bf0d21..becbd5f38c 100644 --- a/win32/file.c +++ b/win32/file.c @@ -27,7 +27,7 @@ static struct code_page_table { #define INVALID_CODE_PAGE 51932 #define PATH_BUFFER_SIZE MAX_PATH * 2 -#define insecure_obj_p(obj, level) ((level) >= 4 || ((level) > 0 && OBJ_TAINTED(obj))) +#define insecure_obj_p(obj, level) ((level) > 0 && OBJ_TAINTED(obj)) /* defined in win32/win32.c */ #define system_code_page rb_w32_filecp