diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | random.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Jul 11 02:37:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * random.c (limited_rand): expands to long before shift so tha + the result does not overflow. + Sat Jul 11 00:16:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * random.c (rand_init): got rid of buffer overflow. @@ -414,8 +414,8 @@ limited_rand(struct MT *mt, unsigned long limit) retry: val = 0; for (i = SIZEOF_LONG/4-1; 0 <= i; i--) { - if (mask >> (i * 32)) { - val |= genrand_int32(mt) << (i * 32); + if ((mask >> (i * 32)) & 0xffffffff) { + val |= (unsigned long)genrand_int32(mt) << (i * 32); val &= mask; if (limit < val) goto retry; |