diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-05 16:14:55 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-05 16:14:55 +0000 |
commit | 48e4c275f20041316bd6df4fc4ed0e8c5243f7d8 (patch) | |
tree | 678adeb8eea47bab6319f19739d34c82e23b1bc1 | |
parent | 67dfae2d4c07f616860fc8392a3fbd2dd8b3d421 (diff) |
merges r28548 from trunk into ruby_1_9_2.
--
* vm.c (thread_free): free altstack to prevent memory leak. a patch
from Tomoyuki Chikanaga in [ruby-dev:41815]. [Bug #3537]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | vm.c | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Jul 6 00:34:50 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * vm.c (thread_free): free altstack to prevent memory leak. a patch + from Tomoyuki Chikanaga in [ruby-dev:41815]. [Bug #3537] + Tue Jul 6 00:29:27 2010 Yusuke Endoh <mame@tsg.ne.jp> * string.c (NONASCII_MASK): NONASCII_MASK must be unsigned. @@ -1726,6 +1726,11 @@ thread_free(void *ptr) RUBY_GC_INFO("main thread\n"); } else { +#ifdef USE_SIGALTSTACK + if (th->altstack) { + free(th->altstack); + } +#endif ruby_xfree(ptr); } } |