aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-19 12:09:14 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-19 12:09:14 +0000
commit67d0fbd03f46edcc0a6fb2a65409ebfa6be25534 (patch)
tree688c78e8fbf9b97d2e43f31c969ba27c3c3af6e0
parent3c95aacfcba7ba30006d128d0f944fce85a79dd7 (diff)
downloadruby-67d0fbd03f46edcc0a6fb2a65409ebfa6be25534.tar.gz
* thread_pthread.c (native_thread_apply_priority):
fix argument range check. [ruby-dev:33124] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 886fbbbfc7..17343394d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 19 21:07:48 2008 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.c (native_thread_apply_priority):
+ fix argument range check. [ruby-dev:33124]
+
Mon May 19 18:22:35 2008 Akinori MUSHA <knu@iDaemons.org>
* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
diff --git a/thread_pthread.c b/thread_pthread.c
index 5ea391abd4..58ce378841 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -358,12 +358,12 @@ native_thread_apply_priority(rb_thread_t *th)
max = sched_get_priority_max(policy);
min = sched_get_priority_min(policy);
- if (min < priority) {
- priority = max;
- }
- else if (max > priority) {
+ if (min > priority) {
priority = min;
}
+ else if (max < priority) {
+ priority = max;
+ }
sp.sched_priority = priority;
pthread_setschedparam(th->thread_id, policy, &sp);