diff options
| author | okkez <okkez@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-13 15:29:27 +0000 |
|---|---|---|
| committer | okkez <okkez@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-13 15:29:27 +0000 |
| commit | cedd050e4d5c97db2f584b2a6a452fc326e0bc4b (patch) | |
| tree | 270e14266e0d9460db8694fe3af772ab9d28cd0c | |
| parent | fada2e46bbabeeafdb34800dcd9261aac65c0cde (diff) | |
merge revision(s) 34033: [Backport #5997]
* 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_2@34583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread_pthread.c | 1 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Feb 14 00:00:19 2012 okkez <okkez000@gmail.com> + + * thread_pthread.c (rb_thread_create_timer_thread): fix memory + leak. [ruby-dev:44904] [Bug #5688] + Fri Feb 9 02:11:19 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> * backport r34482 from trunk diff --git a/thread_pthread.c b/thread_pthread.c index cf054f5e44..627e39bb60 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -857,6 +857,7 @@ rb_thread_create_timer_thread(void) } native_cond_wait(&timer_thread_cond, &timer_thread_lock); native_mutex_unlock(&timer_thread_lock); + pthread_attr_destroy(&attr); } rb_disable_interrupt(); /* only timer thread recieve signal */ } @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 315 +#define RUBY_PATCHLEVEL 316 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 10 -#define RUBY_RELEASE_DATE "2012-02-10" +#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DATE "2012-02-14" #include "ruby/version.h" |