naruse	2012-02-10 17:02:56 +0900 (Fri, 10 Feb 2012)

  New Revision: 34532

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34532

  Log:
    merge revision(s) 34033: [Backport #5996]
    
    * thread_pthread.c (rb_thread_create_timer_thread): fix memory
      leak. [ruby-dev:44904] [Bug #5688]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/thread_pthread.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34531)
+++ ruby_1_9_3/ChangeLog	(revision 34532)
@@ -1,3 +1,8 @@
+Fri Feb 10 17:02:12 2012  okkez  <okkez000@g...>
+
+	* 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@r...>
 
 	* cont.c (fiber_setcontext): Use longjmp() instead of swapcontext() on
Index: ruby_1_9_3/thread_pthread.c
===================================================================
--- ruby_1_9_3/thread_pthread.c	(revision 34531)
+++ ruby_1_9_3/thread_pthread.c	(revision 34532)
@@ -1246,6 +1246,7 @@
 	    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 */
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34531)
+++ ruby_1_9_3/version.h	(revision 34532)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/