diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-09 08:50:04 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-09 08:50:04 +0000 |
commit | 61fbdef3496e6733ae73cc8432f06431fc9e5ac1 (patch) | |
tree | 6c37cd0195e4bd13aef078915b7f58acffa8c60f | |
parent | ef05955d2f1e8d6eeee8eff90f7ceabf89c0182f (diff) | |
download | ruby-61fbdef3496e6733ae73cc8432f06431fc9e5ac1.tar.gz |
* file.c (rb_find_file): should not call fpath_check() with NULL.
fixed: [ruby-core:09867]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Jan 9 17:48:38 2007 NAKAMURA Usaku <usa@ruby-lang.org> + + * file.c (rb_find_file): should not call fpath_check() with NULL. + fixed: [ruby-core:09867] + Tue Jan 9 03:54:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_upto): String#upto from empty string makes @@ -4298,7 +4298,9 @@ rb_find_file(VALUE path) if (!lpath) { return 0; /* no path, no load */ } - f = dln_find_file(f, lpath); + if (!(f = dln_find_file(f, lpath))) { + return 0; + } if (rb_safe_level() >= 1 && !fpath_check(f)) { rb_raise(rb_eSecurityError, "loading from unsafe file %s", f); } |