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
This commit is contained in:
naruse 2012-02-10 08:02:56 +00:00
parent 513b0988f0
commit d91a05c887
3 changed files with 7 additions and 1 deletions

View file

@ -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> Fri Feb 10 05:22:32 2012 NARUSE, Yui <naruse@ruby-lang.org>
* cont.c (fiber_setcontext): Use longjmp() instead of swapcontext() on * cont.c (fiber_setcontext): Use longjmp() instead of swapcontext() on

View file

@ -1246,6 +1246,7 @@ rb_thread_create_timer_thread(void)
fprintf(stderr, "[FATAL] Failed to create timer thread (errno: %d)\n", err); fprintf(stderr, "[FATAL] Failed to create timer thread (errno: %d)\n", err);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
pthread_attr_destroy(&attr);
} }
rb_disable_interrupt(); /* only timer thread recieve signal */ rb_disable_interrupt(); /* only timer thread recieve signal */

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 80 #define RUBY_PATCHLEVEL 81
#define RUBY_RELEASE_DATE "2012-02-10" #define RUBY_RELEASE_DATE "2012-02-10"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012