* file.c (rb_get_path_check): check with given safe level.

* file.c (rb_find_file_ext_safe, rb_find_file_safe): ditto.

* safe.c (rb_insecure_operation): function to raise security error.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 7 deletions

diff --git a/safe.c b/safe.c
index ebe62f420..bb725e139 100644
--- a/safe.c
+++ b/safe.c
@@ -98,16 +98,22 @@ rb_secure_update(VALUE obj)
 }
 
 void
+rb_insecure_operation(void)
+{
+    if (rb_frame_callee()) {
+	rb_raise(rb_eSecurityError, "Insecure operation - %s",
+		 rb_id2name(rb_frame_callee()));
+    }
+    else {
+	rb_raise(rb_eSecurityError, "Insecure operation: -r");
+    }
+}
+
+void
 rb_check_safe_obj(VALUE x)
 {
     if (rb_safe_level() > 0 && OBJ_TAINTED(x)) {
-	if (rb_frame_callee()) {
-	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
-		     rb_id2name(rb_frame_callee()));
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation: -r");
-	}
+	rb_insecure_operation();
     }
     rb_secure(4);
 }