summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-11 16:12:29 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-11 16:12:29 +0000
commitb9ae7528dd0fc3b69cedc37a390e7d82accddeda (patch)
tree5fef05be76d79777ec2924f4738a72eb60dd447c /load.c
parent2e081760e3007505ac821869a15ca2922b88b4f9 (diff)
merge revision(s) 50515: [Backport #11155]
* load.c (loaded_feature_path): stop returning false negatives for filenames which are trailing substrings of file extensions. For example, 'b', which a trailing substring of ".rb" should not return false. [Bug #11155][ruby-core:69206] * test/ruby/test_autoload.rb: test for fix git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50835 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 65017c9895..af3548c19a 100644
--- a/load.c
+++ b/load.c
@@ -318,7 +318,7 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len,
const char *e;
if (vlen < len+1) return 0;
- if (!strncmp(name+(vlen-len), feature, len)) {
+ if (strchr(feature, '.') && !strncmp(name+(vlen-len), feature, len)) {
plen = vlen - len;
}
else {