diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2019-07-15 14:02:45 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2019-07-15 14:08:17 +0900 |
| commit | 5353401c254a926426d9a289606fad18a755fcd2 (patch) | |
| tree | 26cd75d55061070bbc1464d3247015da9bc03dd4 /thread.c | |
| parent | 62f34bd1fe9630b0e760860017955cec2d5fbd0a (diff) | |
| download | ruby-5353401c254a926426d9a289606fad18a755fcd2.tar.gz | |
thread.c (rb_thread_shield_waiting_{inc,dec}): prefer long to int
`(unsigned int)(THREAD_SHIELD_WAITING_MASK>>THREAD_SHIELD_WAITING_SHIFT)`
is 0xffffffff, and w > 0xffffffff is always true.
Coverity Scan pointed out this issue.
Diffstat (limited to 'thread.c')
| -rw-r--r-- | thread.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4720,14 +4720,14 @@ thread_shield_alloc(VALUE klass) #define GetThreadShieldPtr(obj) ((VALUE)rb_check_typeddata((obj), &thread_shield_data_type)) #define THREAD_SHIELD_WAITING_MASK (FL_USER0|FL_USER1|FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6|FL_USER7|FL_USER8|FL_USER9|FL_USER10|FL_USER11|FL_USER12|FL_USER13|FL_USER14|FL_USER15|FL_USER16|FL_USER17|FL_USER18|FL_USER19) #define THREAD_SHIELD_WAITING_SHIFT (FL_USHIFT) -#define rb_thread_shield_waiting(b) (int)((RBASIC(b)->flags&THREAD_SHIELD_WAITING_MASK)>>THREAD_SHIELD_WAITING_SHIFT) +#define rb_thread_shield_waiting(b) ((RBASIC(b)->flags&THREAD_SHIELD_WAITING_MASK)>>THREAD_SHIELD_WAITING_SHIFT) static inline void rb_thread_shield_waiting_inc(VALUE b) { - unsigned int w = rb_thread_shield_waiting(b); + unsigned long w = rb_thread_shield_waiting(b); w++; - if (w > (unsigned int)(THREAD_SHIELD_WAITING_MASK>>THREAD_SHIELD_WAITING_SHIFT)) + if (w > (THREAD_SHIELD_WAITING_MASK>>THREAD_SHIELD_WAITING_SHIFT)) rb_raise(rb_eRuntimeError, "waiting count overflow"); RBASIC(b)->flags &= ~THREAD_SHIELD_WAITING_MASK; RBASIC(b)->flags |= ((VALUE)w << THREAD_SHIELD_WAITING_SHIFT); @@ -4736,7 +4736,7 @@ rb_thread_shield_waiting_inc(VALUE b) static inline void rb_thread_shield_waiting_dec(VALUE b) { - unsigned int w = rb_thread_shield_waiting(b); + unsigned long w = rb_thread_shield_waiting(b); if (!w) rb_raise(rb_eRuntimeError, "waiting count underflow"); w--; RBASIC(b)->flags &= ~THREAD_SHIELD_WAITING_MASK; |