summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-29 17:14:18 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-29 17:14:18 +0000
commitb28b55633f5233a3cdbe20a5b765e2b932c2e5c1 (patch)
treed37b0ebb7c8913c30e0b7aa0e3bf7d2d4938c4b7 /load.c
parentf75d4ca72cb3a9f273d0dc16b0b5a4ea49eb3daa (diff)
merges r21875 from trunk into ruby_1_9_1.
* 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/branches/ruby_1_9_1@21881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r--load.c2
1 files changed, 1 insertions, 1 deletions
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 {