summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 23:53:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 23:53:02 +0000
commit5093a9eff1ba5610daefdb18a0f455f0222acccf (patch)
tree2ceb1a0bf2bb0885681fb245e78815a41e660789
parentfb3709dff3a99908fab6a878e2e13a5a7e5757a2 (diff)
* eval.c (rb_feature_p): check loading_tbl if the given ext is
empty. [ruby-dev:30452] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9b3832d1e..caf014806e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 1 08:53:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_feature_p): check loading_tbl if the given ext is
+ empty. [ruby-dev:30452]
+
Thu Mar 1 03:30:21 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
diff --git a/eval.c b/eval.c
index c49e36f2b8..6be7fd7b46 100644
--- a/eval.c
+++ b/eval.c
@@ -6982,7 +6982,7 @@ rb_feature_p(feature, ext, rb)
else {
char *buf;
- if (ext) return 0;
+ if (ext && *ext) return 0;
buf = ALLOCA_N(char, len + DLEXT_MAXLEN + 1);
strcpy(buf, feature);
for (i = 0; (e = loadable_ext[i]) != 0; i++) {