diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | win32/file.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Apr 22 10:43:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * 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 <hsbt@ruby-lang.org> * benchmark/bm_so_meteor_contest.rb: fix a typo. @@ -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 |