diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-09 08:48:03 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-09 08:48:03 +0000 |
commit | d158c316839252f07519ffc9448614fc4b7a3588 (patch) | |
tree | 48d81958625eddb0cf310b72d927a2d3c925d742 | |
parent | 76563bb82f9755b78f205b216e30cc3b5e9612a9 (diff) |
* 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/branches/ruby_1_8@11519 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:45:17 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 @@ -4341,7 +4341,9 @@ rb_find_file(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); } |