summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 08:41:44 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 08:41:44 +0000
commit3e923d8ce3d8ad7e6d84867f6e9152de1c2984ea (patch)
tree28a15b15a96d2f76a8f0e85a869ddc252d356b0c
parent4342fecac1bfca658c01d21fb2edac50c541c713 (diff)
merges r20143 from trunk into ruby_1_9_1.
* safe.c (safe_setter): add warning for $SAFE=3. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--safe.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dc5efb501f..779507b38a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 8 05:31:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * safe.c (safe_setter): add warning for $SAFE=3.
+
Fri Nov 7 22:51:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* inits.c (rb_call_inits): do not repeat.
diff --git a/safe.c b/safe.c
index e351579132..ebe62f4206 100644
--- a/safe.c
+++ b/safe.c
@@ -66,6 +66,9 @@ safe_setter(VALUE val)
"tried to downgrade safe level from %d to %d",
th->safe_level, level);
}
+ if (level == 3) {
+ rb_warning("$SAFE=3 does no sandboxing; you might want to use $SAFE=4");
+ }
if (level > SAFE_LEVEL_MAX) {
level = SAFE_LEVEL_MAX;
}