1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* random.c (rand_init): got rid of buffer overflow.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-10 15:16:32 +00:00
parent 38867cc115
commit 1dabc36b8f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Jul 11 00:16:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* random.c (rand_init): got rid of buffer overflow.
Sat Jul 11 00:11:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jul 11 00:11:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (ary_join_1): should recurse for element array. * array.c (ary_join_1): should recurse for element array.

4
random.c
View File

@ -253,7 +253,7 @@ rand_init(struct MT *mt, VALUE vseed)
} }
len = (len + 3) / 4; /* number of 32bit words */ len = (len + 3) / 4; /* number of 32bit words */
buf = ALLOC_N(unsigned int, len); /* allocate longs for init_by_array */ buf = ALLOC_N(unsigned int, len); /* allocate longs for init_by_array */
memset(buf, 0, len * sizeof(long)); memset(buf, 0, len * sizeof(int));
if (FIXNUM_P(seed)) { if (FIXNUM_P(seed)) {
buf[0] = (unsigned int)(FIX2ULONG(seed) & 0xffffffff); buf[0] = (unsigned int)(FIX2ULONG(seed) & 0xffffffff);
#if SIZEOF_LONG > 4 #if SIZEOF_LONG > 4
@ -322,7 +322,7 @@ fill_random_seed(unsigned int seed[DEFAULT_SEED_CNT])
seed[0] ^= tv.tv_usec; seed[0] ^= tv.tv_usec;
seed[1] ^= (unsigned int)tv.tv_sec; seed[1] ^= (unsigned int)tv.tv_sec;
#if SIZEOF_TIME_T > SIZEOF_INT #if SIZEOF_TIME_T > SIZEOF_INT
seed[1] ^= (unsigned int)(tv.tv_sec >> SIZEOF_INT * CHAR_BIT); seed[0] ^= (unsigned int)(tv.tv_sec >> SIZEOF_INT * CHAR_BIT);
#endif #endif
seed[2] ^= getpid() ^ (n++ << 16); seed[2] ^= getpid() ^ (n++ << 16);
seed[3] ^= (unsigned int)(VALUE)&seed; seed[3] ^= (unsigned int)(VALUE)&seed;