summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--cont.c1
-rw-r--r--version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f57016cc80..73e384f441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 9 17:08:20 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * cont.c (cont_mark): mark original Thread object from saved_thread.
+ [ruby-dev:44567] [Bug #5386]
+
Thu Feb 9 17:05:07 2012 NARUSE, Yui <naruse@ruby-lang.org>
* cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
diff --git a/cont.c b/cont.c
index f7a9057f65..490ffac80b 100644
--- a/cont.c
+++ b/cont.c
@@ -139,6 +139,7 @@ cont_mark(void *ptr)
rb_context_t *cont = ptr;
rb_gc_mark(cont->value);
rb_thread_mark(&cont->saved_thread);
+ rb_gc_mark(cont->saved_thread.self);
if (cont->vm_stack) {
#ifdef CAPTURE_JUST_VALID_VM_STACK
diff --git a/version.h b/version.h
index 3ff34ae322..5effd2e0f5 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 75
+#define RUBY_PATCHLEVEL 76
#define RUBY_RELEASE_DATE "2012-02-09"
#define RUBY_RELEASE_YEAR 2012