summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-05 14:28:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-05 14:28:00 +0000
commitb55aabf9f78ae47fb3702c926843642467581167 (patch)
tree9b603579caead97f8033b4f1a47b85c0172b51dd
parent1e63fcd6eb1f9d5bcda47cf19bc7be3a88bd43e0 (diff)
downloadruby-b55aabf9f78ae47fb3702c926843642467581167.tar.gz
ruby-b55aabf9f78ae47fb3702c926843642467581167.tar.xz
ruby-b55aabf9f78ae47fb3702c926843642467581167.zip
* eval.c (rb_thread_save_context): must not switch contexts during
re-allocating stack. fixed: [ruby-core:05219] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 34a1db9bd..6bb6ad78e 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 7a4a50c53..8d612b560 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;