diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-23 15:41:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-23 15:41:17 +0000 |
commit | d0c2e3c7c95302c70a19b3d1d34bcb67da9f982f (patch) | |
tree | 98f87153e07f9132593cdc6ccd69033681e23034 /eval.c | |
parent | 9c65d88c0e0bf5c148f6f591edd7f440bc4e4bf6 (diff) | |
download | ruby-d0c2e3c7c95302c70a19b3d1d34bcb67da9f982f.tar.gz |
* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
frozen shared string to avoid outside modification. [ruby-dev:24580]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -6438,6 +6438,7 @@ rb_load(fname, wrap) if (!wrap) rb_secure(4); FilePathValue(fname); + fname = rb_str_new4(fname); tmp = rb_find_file(fname); if (!tmp) { load_failed(fname); @@ -6691,7 +6692,7 @@ search_required(fname, featurep, path) char *ext, *ftptr; int type; - *featurep = fname = rb_str_new4(fname); + *featurep = fname; *path = 0; ext = strrchr(ftptr = RSTRING(fname)->ptr, '.'); if (ext && !strchr(ext, '/')) { @@ -6705,6 +6706,7 @@ search_required(fname, featurep, path) tmp = rb_str_new(RSTRING(fname)->ptr, ext-RSTRING(fname)->ptr); *featurep = tmp; #ifdef DLEXT2 + OBJ_FREEZE(tmp); if (rb_find_file_ext(&tmp, loadable_ext+1)) { *featurep = tmp; *path = rb_find_file(tmp); @@ -6712,6 +6714,7 @@ search_required(fname, featurep, path) } #else rb_str_cat2(tmp, DLEXT); + OBJ_FREEZE(tmp); if (*path = rb_find_file(tmp)) { return 's'; } @@ -6763,6 +6766,7 @@ rb_require_safe(fname, safe) char *volatile ftptr = 0; FilePathValue(fname); + fname = rb_str_new4(fname); saved.vmode = scope_vmode; saved.node = ruby_current_node; saved.func = ruby_frame->last_func; @@ -6832,7 +6836,9 @@ VALUE rb_require(fname) const char *fname; { - return rb_require_safe(rb_str_new2(fname), ruby_safe_level); + VALUE fn = rb_str_new2(fname); + OBJ_FREEZE(fn); + return rb_require_safe(fn, ruby_safe_level); } static void |