summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);