diff --git a/ChangeLog b/ChangeLog
index 34a1db9bdc..6bb6ad78ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Tue Jul  5 23:23:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul  5 23:27:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (sort_2): get rid of yet another bcc's bug.
 	  fixed: [ruby-core:05152]
 
+	* eval.c (rb_thread_save_context): must not switch contexts during
+	  re-allocating stack.  fixed: [ruby-core:05219]
+
 Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil.c: fix typo.
diff --git a/eval.c b/eval.c
index 7a4a50c537..8d612b5601 100644
--- a/eval.c
+++ b/eval.c
@@ -10329,7 +10329,9 @@ rb_thread_save_context(th)
     th->stk_len = 0;
     th->stk_pos = pos;
     if (len > th->stk_max) {
-	REALLOC_N(th->stk_ptr, VALUE, len);
+	VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
+	if (!ptr) rb_memerror();
+	th->stk_ptr = ptr;
 	th->stk_max = len;
     }
     th->stk_len = len;