summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-13 23:59:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-13 23:59:41 +0000
commita1f4ea2127eea422a514c9d9ec646c98269e67ae (patch)
tree8d5e5d969f2bbf7b65de1992c24db87874e0e2fb
parentd5938dd1c4ab8cad1fedc5dea28a32f5c58e6bd6 (diff)
* dir.c (rb_push_glob): avoid SEGV when no block given.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1e1009439..7442d312c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 14 08:57:41 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * dir.c (rb_push_glob): avoid SEGV when no block given.
+
Wed Mar 13 19:05:15 2002 Akinori MUSHA <knu@iDaemons.org>
* dir.c: FNM_PERIOD is obsoleted and FNM_DOTMATCH is introduced
diff --git a/dir.c b/dir.c
index 587d96d456..22dba86c8b 100644
--- a/dir.c
+++ b/dir.c
@@ -912,7 +912,7 @@ rb_push_glob(str, flags)
VALUE ary;
if (rb_block_given_p())
- ary = Qnil;
+ ary = 0;
else
ary = rb_ary_new();