diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-02 00:32:40 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-02 00:32:40 +0000 |
commit | f11b31ba983113802b425d8d41a7c79d8c995cd9 (patch) | |
tree | 678ed4b275c4b715a1cc3dfe561c74d3a4776049 /random.c | |
parent | 8e5147aa47233f185a790a9cb076f33c4aeca7e3 (diff) | |
download | ruby-f11b31ba983113802b425d8d41a7c79d8c995cd9.tar.gz ruby-f11b31ba983113802b425d8d41a7c79d8c995cd9.tar.xz ruby-f11b31ba983113802b425d8d41a7c79d8c995cd9.zip |
* random.c (limited_big_rand): fix buffer overflow when SIZEOF_BDIGITS
is 2. fixed by Kenta Murata. [ruby-dev:33565]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'random.c')
-rw-r--r-- | random.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -385,12 +385,16 @@ limited_big_rand(struct RBignum *limit) val = (struct RBignum *)rb_big_clone((VALUE)limit); RBIGNUM_SET_SIGN(val, 1); #if SIZEOF_BDIGITS == 2 -# define BIG_GET32(big,i) (RBIGNUM_DIGITS(big)[(i)*2] | \ - ((i)*2+1 < RBIGNUM_DIGITS(big) ? (RBIGNUM_DIGITS(big)[(i)*2+1] << 16) \ - : 0)) -# define BIG_SET32(big,i,d) ((RBIGNUM_DIGITS(big)[(i)*2] = (d) & 0xffff), \ - ((i)*2+1 < RBIGNUM_DIGITS(big) ? (RBIGNUM_DIGITS(big)[(i)*2+1] = (d) >> 16) \ - : 0)) +# define BIG_GET32(big,i) \ + (RBIGNUM_DIGITS(big)[(i)*2] | \ + ((i)*2+1 < RBIGNUM_LEN(big) ? \ + (RBIGNUM_DIGITS(big)[(i)*2+1] << 16) : \ + 0)) +# define BIG_SET32(big,i,d) \ + ((RBIGNUM_DIGITS(big)[(i)*2] = (d) & 0xffff), \ + ((i)*2+1 < RBIGNUM_LEN(big) ? \ + (RBIGNUM_DIGITS(big)[(i)*2+1] = (d) >> 16) : \ + 0)) #else /* SIZEOF_BDIGITS == 4 */ # define BIG_GET32(big,i) (RBIGNUM_DIGITS(big)[i]) |