summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-25 01:20:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-25 01:20:01 +0000
commit51a1c68bc748f1fce2461b3c8a2a75c9c20477d6 (patch)
treea4edcf3abada40121589dcf7ff2bef62aaa28c5a /hash.c
parent20014eb3e06ea70a80caddea35c50ef3bb403c8c (diff)
hash.c: prohibit tainted strings
* hash.c (env_aset, env_has_key, env_assoc, env_has_value), (env_rassoc, env_key): prohibit tainted strings if $SAFE is non-zero. [Bug #9976] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/hash.c b/hash.c
index b1760a8..0250256 100644
--- a/hash.c
+++ b/hash.c
@@ -2871,8 +2871,8 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
env_delete(obj, nm);
return Qnil;
}
- StringValue(nm);
- StringValue(val);
+ SafeStringValue(nm);
+ SafeStringValue(val);
name = RSTRING_PTR(nm);
value = RSTRING_PTR(val);
if (memchr(name, '\0', RSTRING_LEN(nm)))
@@ -3369,7 +3369,8 @@ env_has_key(VALUE env, VALUE key)
{
char *s;
- s = StringValuePtr(key);
+ SafeStringValue(key);
+ s = RSTRING_PTR(key);
if (memchr(s, '\0', RSTRING_LEN(key)))
rb_raise(rb_eArgError, "bad environment variable name");
if (getenv(s)) return Qtrue;
@@ -3388,7 +3389,8 @@ env_assoc(VALUE env, VALUE key)
{
char *s, *e;
- s = StringValuePtr(key);
+ SafeStringValue(key);
+ s = RSTRING_PTR(key);
if (memchr(s, '\0', RSTRING_LEN(key)))
rb_raise(rb_eArgError, "bad environment variable name");
e = getenv(s);
@@ -3410,6 +3412,7 @@ env_has_value(VALUE dmy, VALUE obj)
obj = rb_check_string_type(obj);
if (NIL_P(obj)) return Qnil;
+ rb_check_safe_obj(obj);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
@@ -3440,6 +3443,7 @@ env_rassoc(VALUE dmy, VALUE obj)
obj = rb_check_string_type(obj);
if (NIL_P(obj)) return Qnil;
+ rb_check_safe_obj(obj);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
@@ -3470,7 +3474,7 @@ env_key(VALUE dmy, VALUE value)
char **env;
VALUE str;
- StringValue(value);
+ SafeStringValue(value);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');