Permalink
Browse files

* thread_pthread.c (rb_thread_create_timer_thread): Added error

  check when failing fcntl(). [Bug #6147] [ruby-dev:45364]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent c7c7dfd commit 1a2ef6bae3c0db71adbbe9e871ca87a87b4d647c @kosaki kosaki committed May 18, 2012
Showing with 13 additions and 4 deletions.
  1. +5 −0 ChangeLog
  2. +8 −4 thread_pthread.c
View
@@ -1,3 +1,8 @@
+Fri May 18 17:39:42 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c (rb_thread_create_timer_thread): Added error
+ check when failing fcntl(). [Bug #6147] [ruby-dev:45364]
+
Fri May 18 17:41:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): link archives only, skip script only
View
@@ -1252,14 +1252,18 @@ rb_thread_create_timer_thread(void)
}
rb_update_max_fd(timer_thread_pipe[0]);
rb_update_max_fd(timer_thread_pipe[1]);
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL)
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK)
{
int oflags;
-#if defined(O_NONBLOCK)
+ int err;
+
oflags = fcntl(timer_thread_pipe[1], F_GETFL);
+ if (oflags == -1)
+ rb_sys_fail(0);
oflags |= O_NONBLOCK;
- fcntl(timer_thread_pipe[1], F_SETFL, oflags);
-#endif /* defined(O_NONBLOCK) */
+ err = fcntl(timer_thread_pipe[1], F_SETFL, oflags);
+ if (err == -1)
+ rb_sys_fail(0);
}
#endif /* defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) */

0 comments on commit 1a2ef6b

Please sign in to comment.