summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-03 03:37:56 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-03 03:37:56 +0000
commit5e49578140865407cf1b268c41db4c45feb1db72 (patch)
tree7e8f29ab30015bff4477580b302c223734e9a23a
parent7933bf76e9f5986f763241a1721ed91acb43c197 (diff)
downloadruby-5e49578140865407cf1b268c41db4c45feb1db72.tar.gz
ruby-5e49578140865407cf1b268c41db4c45feb1db72.tar.xz
ruby-5e49578140865407cf1b268c41db4c45feb1db72.zip
* io.c (ruby_dup): start GC on ENOMEM as well.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bca7f193b..a9f12356b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 3 11:36:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (ruby_dup): start GC on ENOMEM as well.
+
Mon Jan 1 06:13:11 2007 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible. Update constant
diff --git a/io.c b/io.c
index 411887297..fa44bf93e 100644
--- a/io.c
+++ b/io.c
@@ -318,7 +318,7 @@ ruby_dup(orig)
fd = dup(orig);
if (fd < 0) {
- if (errno == EMFILE || errno == ENFILE) {
+ if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
rb_gc();
fd = dup(orig);
}