diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-10 08:02:56 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-10 08:02:56 +0000 |
commit | d91a05c8874dec82c73e50151136de51b7413477 (patch) | |
tree | 8abfc074de08f588ea915353af3c998141c3d71f | |
parent | 513b0988f0703d7443fca2e6bc883bac23346cad (diff) |
merge revision(s) 34033: [Backport #5996]
* thread_pthread.c (rb_thread_create_timer_thread): fix memory
leak. [ruby-dev:44904] [Bug #5688]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread_pthread.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Feb 10 17:02:12 2012 okkez <okkez000@gmail.com> + + * thread_pthread.c (rb_thread_create_timer_thread): fix memory + leak. [ruby-dev:44904] [Bug #5688] + Fri Feb 10 05:22:32 2012 NARUSE, Yui <naruse@ruby-lang.org> * cont.c (fiber_setcontext): Use longjmp() instead of swapcontext() on diff --git a/thread_pthread.c b/thread_pthread.c index 38f968e5a1..eff3d81368 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1246,6 +1246,7 @@ rb_thread_create_timer_thread(void) fprintf(stderr, "[FATAL] Failed to create timer thread (errno: %d)\n", err); exit(EXIT_FAILURE); } + pthread_attr_destroy(&attr); } rb_disable_interrupt(); /* only timer thread recieve signal */ @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 80 +#define RUBY_PATCHLEVEL 81 #define RUBY_RELEASE_DATE "2012-02-10" #define RUBY_RELEASE_YEAR 2012 |