1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (rb_f_getenv): prohibit for $SAFE=4. [ruby-dev:24908]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-11-18 08:11:12 +00:00
parent fc20fdcbc8
commit 5141d3ea79
5 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@ Thu Nov 18 17:05:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (f_rest_arg): store rest args into invisible local variabe * parse.y (f_rest_arg): store rest args into invisible local variabe
in order to get rid of SEGV at ZSUPER. [ruby-dev:24913] in order to get rid of SEGV at ZSUPER. [ruby-dev:24913]
Thu Nov 18 15:39:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_f_getenv): prohibit for $SAFE=4. [ruby-dev:24908]
Thu Nov 18 14:58:42 2004 Shugo Maeda <shugo@ruby-lang.org> Thu Nov 18 14:58:42 2004 Shugo Maeda <shugo@ruby-lang.org>
* ext/readline/readline.c: check $SAFE. * ext/readline/readline.c: check $SAFE.

55
hash.c
View File

@ -1690,7 +1690,8 @@ rb_f_getenv(obj, name)
{ {
char *nam, *env; char *nam, *env;
StringValue(name); rb_secure(4);
SafeStringValue(name);
nam = RSTRING(name)->ptr; nam = RSTRING(name)->ptr;
if (strlen(nam) != RSTRING(name)->len) { if (strlen(nam) != RSTRING(name)->len) {
rb_raise(rb_eArgError, "bad environment variable name"); rb_raise(rb_eArgError, "bad environment variable name");
@ -1722,12 +1723,13 @@ env_fetch(argc, argv)
long block_given; long block_given;
char *nam, *env; char *nam, *env;
rb_secure(4);
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");
} }
StringValue(key); SafeStringValue(key);
nam = RSTRING(key)->ptr; nam = RSTRING(key)->ptr;
if (strlen(nam) != RSTRING(key)->len) { if (strlen(nam) != RSTRING(key)->len) {
rb_raise(rb_eArgError, "bad environment variable name"); rb_raise(rb_eArgError, "bad environment variable name");
@ -1924,8 +1926,10 @@ static VALUE
env_keys() env_keys()
{ {
char **env; char **env;
VALUE ary = rb_ary_new(); VALUE ary;
rb_secure(4);
ary = rb_ary_new();
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -1942,9 +1946,11 @@ static VALUE
env_each_key(ehash) env_each_key(ehash)
VALUE ehash; VALUE ehash;
{ {
VALUE keys = env_keys(); VALUE keys;
long i; long i;
rb_secure(4);
keys = env_keys();
for (i=0; i<RARRAY(keys)->len; i++) { for (i=0; i<RARRAY(keys)->len; i++) {
rb_yield(RARRAY(keys)->ptr[i]); rb_yield(RARRAY(keys)->ptr[i]);
} }
@ -1954,9 +1960,11 @@ env_each_key(ehash)
static VALUE static VALUE
env_values() env_values()
{ {
VALUE ary;
char **env; char **env;
VALUE ary = rb_ary_new();
rb_secure(4);
ary = rb_ary_new();
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -1976,6 +1984,8 @@ env_each_value(ehash)
VALUE values = env_values(); VALUE values = env_values();
long i; long i;
rb_secure(4);
values = env_values();
for (i=0; i<RARRAY(values)->len; i++) { for (i=0; i<RARRAY(values)->len; i++) {
rb_yield(RARRAY(values)->ptr[i]); rb_yield(RARRAY(values)->ptr[i]);
} }
@ -1988,9 +1998,11 @@ env_each_i(ehash, values)
int values; int values;
{ {
char **env; char **env;
VALUE ary = rb_ary_new(); VALUE ary;
long i; long i;
rb_secure(4);
ary = rb_ary_new();
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -2036,7 +2048,6 @@ env_reject_bang()
rb_secure(4); rb_secure(4);
keys = env_keys(); keys = env_keys();
for (i=0; i<RARRAY(keys)->len; i++) { for (i=0; i<RARRAY(keys)->len; i++) {
VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]); VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
if (!NIL_P(val)) { if (!NIL_P(val)) {
@ -2063,9 +2074,11 @@ env_values_at(argc, argv)
int argc; int argc;
VALUE *argv; VALUE *argv;
{ {
VALUE result = rb_ary_new(); VALUE result;
long i; long i;
rb_secure(4);
result = rb_ary_new();
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
rb_ary_push(result, rb_f_getenv(Qnil, argv[i])); rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
} }
@ -2078,6 +2091,7 @@ env_select()
VALUE result; VALUE result;
char **env; char **env;
rb_secure(4);
result = rb_ary_new(); result = rb_ary_new();
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
@ -2104,7 +2118,6 @@ env_clear()
rb_secure(4); rb_secure(4);
keys = env_keys(); keys = env_keys();
for (i=0; i<RARRAY(keys)->len; i++) { for (i=0; i<RARRAY(keys)->len; i++) {
VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]); VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
if (!NIL_P(val)) { if (!NIL_P(val)) {
@ -2124,9 +2137,10 @@ static VALUE
env_inspect() env_inspect()
{ {
char **env; char **env;
VALUE str = rb_str_buf_new2("{"); VALUE str, i;
VALUE i;
rb_secure(4);
str = rb_str_buf_new2("{");
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -2154,8 +2168,10 @@ static VALUE
env_to_a() env_to_a()
{ {
char **env; char **env;
VALUE ary = rb_ary_new(); VALUE ary;
rb_secure(4);
ary = rb_ary_new();
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -2181,6 +2197,7 @@ env_size()
int i; int i;
char **env; char **env;
rb_secure(4);
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
for(i=0; env[i]; i++) for(i=0; env[i]; i++)
; ;
@ -2193,6 +2210,7 @@ env_empty_p()
{ {
char **env; char **env;
rb_secure(4);
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
if (env[0] == 0) { if (env[0] == 0) {
FREE_ENVIRON(environ); FREE_ENVIRON(environ);
@ -2208,6 +2226,7 @@ env_has_key(env, key)
{ {
char *s; char *s;
rb_secure(4);
s = StringValuePtr(key); s = StringValuePtr(key);
if (strlen(s) != RSTRING(key)->len) if (strlen(s) != RSTRING(key)->len)
rb_raise(rb_eArgError, "bad environment variable name"); rb_raise(rb_eArgError, "bad environment variable name");
@ -2221,6 +2240,7 @@ env_has_value(dmy, value)
{ {
char **env; char **env;
rb_secure(4);
if (TYPE(value) != T_STRING) return Qfalse; if (TYPE(value) != T_STRING) return Qfalse;
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
@ -2245,6 +2265,7 @@ env_index(dmy, value)
char **env; char **env;
VALUE str; VALUE str;
rb_secure(4);
StringValue(value); StringValue(value);
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
@ -2267,8 +2288,10 @@ static VALUE
env_to_hash() env_to_hash()
{ {
char **env; char **env;
VALUE hash = rb_hash_new(); VALUE hash;
rb_secure(4);
hash = rb_hash_new();
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
while (*env) { while (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -2293,6 +2316,7 @@ env_shift()
{ {
char **env; char **env;
rb_secure(4);
env = GET_ENVIRON(environ); env = GET_ENVIRON(environ);
if (*env) { if (*env) {
char *s = strchr(*env, '='); char *s = strchr(*env, '=');
@ -2330,9 +2354,11 @@ static VALUE
env_replace(env, hash) env_replace(env, hash)
VALUE env, hash; VALUE env, hash;
{ {
volatile VALUE keys = env_keys(); volatile VALUE keys;
long i; long i;
rb_secure(4);
keys = env_keys();
if (env == hash) return env; if (env == hash) return env;
hash = to_hash(hash); hash = to_hash(hash);
rb_hash_foreach(hash, env_replace_i, keys); rb_hash_foreach(hash, env_replace_i, keys);
@ -2360,6 +2386,7 @@ static VALUE
env_update(env, hash) env_update(env, hash)
VALUE env, hash; VALUE env, hash;
{ {
rb_secure(4);
if (env == hash) return env; if (env == hash) return env;
hash = to_hash(hash); hash = to_hash(hash);
rb_hash_foreach(hash, env_update_i, 0); rb_hash_foreach(hash, env_update_i, 0);

2
test/dbm/test_dbm.rb
View File

@ -47,7 +47,7 @@ if defined? DBM
def test_freeze def test_freeze
DBM.open("#{TMPROOT}/a") {|d| DBM.open("#{TMPROOT}/a") {|d|
d.freeze d.freeze
assert_raises(TypeError) { d["k"] = "v" } assert_raises(RuntimeError) { d["k"] = "v" }
} }
end end
end end

2
test/gdbm/test_gdbm.rb
View File

@ -45,7 +45,7 @@ if defined? GDBM
def test_freeze def test_freeze
GDBM.open("#{TMPROOT}/a.dbm") {|d| GDBM.open("#{TMPROOT}/a.dbm") {|d|
d.freeze d.freeze
assert_raises(TypeError) { d["k"] = "v" } assert_raises(RuntimeError) { d["k"] = "v" }
} }
end end
end end

2
test/soap/test_property.rb
View File

@ -130,7 +130,7 @@ __EOP__
tag = Object.new tag = Object.new
tested = false tested = false
@prop.add_hook("foo.bar") do |key, value| @prop.add_hook("foo.bar") do |key, value|
assert_raise(TypeError) do assert_raise(RuntimeError) do
key << "baz" key << "baz"
end end
tested = true tested = true