diff --git a/ChangeLog b/ChangeLog
index ee952f7f36..00b194af8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug  2 17:40:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (blk_free): fixed serious memory leak. [ruby-dev:24013]
+
 Mon Aug  2 11:53:06 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
diff --git a/eval.c b/eval.c
index bfeeac706c..366af113e7 100644
--- a/eval.c
+++ b/eval.c
@@ -668,7 +668,6 @@ static unsigned long frame_unique = 0;
     _frame.node = ruby_current_node;	\
     _frame.iter = ruby_iter->iter;	\
     _frame.argc = 0;			\
-    _frame.flags = FRAME_ALLOCA;	\
     _frame.uniq = frame_unique++;	\
     ruby_frame = &_frame
 
@@ -7750,6 +7749,20 @@ static void
 blk_free(data)
     struct BLOCK *data;
 {
+    struct FRAME *frame;
+    void *tmp;
+
+    frame = data->frame.prev;
+    while (frame) {
+	tmp = frame;
+	frame = frame->prev;
+	free(tmp);
+    }
+    while (data) {
+	tmp = data;
+	data = data->prev;
+	free(tmp);
+    }
 }
 
 static void