diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-13 09:25:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-13 09:25:54 +0000 |
| commit | 80323714621e71c2e379a6c20db310f584ddb72e (patch) | |
| tree | 4c9ce6f378c9ad84e2dc0bc373fdd0ddfeb0197b /thread.c | |
| parent | db02621bfbee60aa373c1b032b34dad6dcbcbd29 (diff) | |
* thread.c (rb_barrier_waiting): fix potential overflows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
| -rw-r--r-- | thread.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3687,18 +3687,18 @@ barrier_alloc(VALUE klass) #define GetBarrierPtr(obj) ((VALUE)rb_check_typeddata((obj), &barrier_data_type)) #define BARRIER_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 BARRIER_WAITING_SHIFT (FL_USHIFT) -#define rb_barrier_waiting(b) ((RBASIC(b)->flags&BARRIER_WAITING_MASK)>>BARRIER_WAITING_SHIFT) +#define rb_barrier_waiting(b) (int)((RBASIC(b)->flags&BARRIER_WAITING_MASK)>>BARRIER_WAITING_SHIFT) #define rb_barrier_waiting_inc(b) do { \ int w = rb_barrier_waiting(b); \ w++; \ RBASIC(b)->flags &= ~BARRIER_WAITING_MASK; \ - RBASIC(b)->flags |= (w << BARRIER_WAITING_SHIFT); \ + RBASIC(b)->flags |= ((VALUE)w << BARRIER_WAITING_SHIFT); \ } while (0) #define rb_barrier_waiting_dec(b) do { \ int w = rb_barrier_waiting(b); \ w--; \ RBASIC(b)->flags &= ~BARRIER_WAITING_MASK; \ - RBASIC(b)->flags |= (w << BARRIER_WAITING_SHIFT); \ + RBASIC(b)->flags |= ((VALUE)w << BARRIER_WAITING_SHIFT); \ } while (0) VALUE |