kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

hash.c: env_name

Browse source 
* hash.c (get_env_ptr, env_name): extract check for bad
  environment variable name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-06-25 12:18:53 +00:00
parent 57c9c3189a
commit e1884ec820
1 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

61
hash.c
View file

@ -2542,16 +2542,25 @@ env_str_new2(const char *ptr)
return env_str_new(ptr, strlen(ptr)); return env_str_new(ptr, strlen(ptr));
} }
#define get_env_ptr(var, val) \
(memchr((var = RSTRING_PTR(val)), '\0', RSTRING_LEN(val)) ? \
rb_raise(rb_eArgError, "bad environment variable " #var) : (void)0)
static inline const char *
env_name(VALUE s)
{
const char *name;
SafeStringValue(s);
get_env_ptr(name, s);
return name;
}
static VALUE static VALUE
env_delete(VALUE obj, VALUE name) env_delete(VALUE obj, VALUE name)
{ {
char *nam, *val; const char *nam, *val;
SafeStringValue(name); nam = env_name(name);
nam = RSTRING_PTR(name);
if (memchr(nam, '\0', RSTRING_LEN(name))) {
rb_raise(rb_eArgError, "bad environment variable name");
}
val = getenv(nam); val = getenv(nam);
if (val) { if (val) {
VALUE value = env_str_new2(val); VALUE value = env_str_new2(val);
@ -2596,13 +2605,9 @@ static int env_path_tainted(const char *);
static VALUE static VALUE
rb_f_getenv(VALUE obj, VALUE name) rb_f_getenv(VALUE obj, VALUE name)
{ {
char *nam, *env; const char *nam, *env;
SafeStringValue(name); nam = env_name(name);
nam = RSTRING_PTR(name);
if (memchr(nam, '\0', RSTRING_LEN(name))) {
rb_raise(rb_eArgError, "bad environment variable name");
}
env = getenv(nam); env = getenv(nam);
if (env) { if (env) {
if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) { if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) {
@ -2632,18 +2637,14 @@ env_fetch(int argc, VALUE *argv)
{ {
VALUE key, if_none; VALUE key, if_none;
long block_given; long block_given;
char *nam, *env; const char *nam, *env;
rb_scan_args(argc, argv, "11", &key, &if_none); rb_scan_args(argc, argv, "11", &key, &if_none);
block_given = rb_block_given_p(); block_given = rb_block_given_p();
if (block_given && argc == 2) { if (block_given && argc == 2) {
rb_warn("block supersedes default value argument"); rb_warn("block supersedes default value argument");
} }
SafeStringValue(key); nam = env_name(key);
nam = RSTRING_PTR(key);
if (memchr(nam, '\0', RSTRING_LEN(key))) {
rb_raise(rb_eArgError, "bad environment variable name");
}
env = getenv(nam); env = getenv(nam);
if (!env) { if (!env) {
if (block_given) return rb_yield(key); if (block_given) return rb_yield(key);
@ -2873,12 +2874,10 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
} }
SafeStringValue(nm); SafeStringValue(nm);
SafeStringValue(val); SafeStringValue(val);
name = RSTRING_PTR(nm); /* nm can be modified in `val.to_str`, don't get `name` before
value = RSTRING_PTR(val); * check for `val` */
if (memchr(name, '\0', RSTRING_LEN(nm))) get_env_ptr(name, nm);
rb_raise(rb_eArgError, "bad environment variable name"); get_env_ptr(value, val);
if (memchr(value, '\0', RSTRING_LEN(val)))
rb_raise(rb_eArgError, "bad environment variable value");
ruby_setenv(name, value); ruby_setenv(name, value);
if (ENVMATCH(name, PATH_ENV)) { if (ENVMATCH(name, PATH_ENV)) {
@ -3367,12 +3366,9 @@ env_empty_p(void)
static VALUE static VALUE
env_has_key(VALUE env, VALUE key) env_has_key(VALUE env, VALUE key)
{ {
char *s; const char *s;
SafeStringValue(key); s = env_name(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; if (getenv(s)) return Qtrue;
return Qfalse; return Qfalse;
} }
@ -3387,12 +3383,9 @@ env_has_key(VALUE env, VALUE key)
static VALUE static VALUE
env_assoc(VALUE env, VALUE key) env_assoc(VALUE env, VALUE key)
{ {
char *s, *e; const char *s, *e;
SafeStringValue(key); s = env_name(key);
s = RSTRING_PTR(key);
if (memchr(s, '\0', RSTRING_LEN(key)))
rb_raise(rb_eArgError, "bad environment variable name");
e = getenv(s); e = getenv(s);
if (e) return rb_assoc_new(key, rb_tainted_str_new2(e)); if (e) return rb_assoc_new(key, rb_tainted_str_new2(e));
return Qnil; return Qnil;