From 1a89baadd3956e3ac185b95796c84c89d7da2519 Mon Sep 17 00:00:00 2001 From: shugo Date: Thu, 29 Jan 2009 07:32:07 +0000 Subject: * load.c (rb_feature_provided): should not calculate len by pointer subtraction because feature may be a expanded path. [ruby-core:21267] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ load.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f03c3cc0c2..d40ea3c0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 29 16:22:41 2009 Shugo Maeda + + * load.c (rb_feature_provided): should not calculate len by pointer + subtraction because feature may be a expanded path. + [ruby-core:21267] + Thu Jan 29 14:12:15 2009 Nobuyoshi Nakada * configure.in (BASERUBY): erases RUBYOPT at the test. diff --git a/load.c b/load.c index 8693aef8ae..8e66a75718 100644 --- a/load.c +++ b/load.c @@ -128,8 +128,8 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c if (fn) *fn = 0; if (ext) { - len = ext - feature; elen = strlen(ext); + len = strlen(feature) - elen; type = rb ? 'r' : 's'; } else { -- cgit v1.2.3