summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-22 14:52:14 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-22 14:52:14 +0000
commit290f2b0c3f4bf51383938d8583f5bebc68a311ed (patch)
treea834ff7295aaf9c99ca44190ef3e171ce55dcbf8 /vm.c
parent1e92c0b98b6a1ea31c57284747033ec6672c2c9c (diff)
merges r20291 from trunk into ruby_1_9_1.
* vm.c (thread_free): th->vm may be NULL when pthread_create failed for ENOMEM. [ruby-dev:37095] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm.c b/vm.c
index 5bf684237e..2bb050d19e 100644
--- a/vm.c
+++ b/vm.c
@@ -1486,7 +1486,7 @@ thread_free(void *ptr)
}
#endif
- if (th->vm->main_thread == th) {
+ if (th->vm && th->vm->main_thread == th) {
RUBY_GC_INFO("main thread\n");
}
else {