2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a49d5d4393..848a4fa7cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
+	  Weil <weil at mail.berlios.de>.
+
 Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
diff --git a/gc.c b/gc.c
index e5ab3523f3..a77f962fcf 100644
--- a/gc.c
+++ b/gc.c
@@ -363,6 +363,7 @@ add_heap()
     if (himem < pend) himem = pend;
     heaps_used++;
     heap_slots *= 1.8;
+    if (heap_slots <= 0) heap_slots = HEAP_MIN_SLOTS;
 
     while (p < pend) {
 	p->as.free.flags = 0;