summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorodaira <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-04 23:44:59 +0000
committerodaira <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-04 23:44:59 +0000
commit270630c6286f1b2250afd2a5cfb2211a55411741 (patch)
tree2218fd6eba5eda5e2db5c22ebe310eb721d9a4f6
parent1d00e40e0cf48ad25c35fa77c54e7dd1571bca23 (diff)
* random.c (random_raw_seed): Avoid calling fill_random_bytes()
if the requested size is 0. AIX returns -1 for 0-byte read from /dev/urandom, while other UNIX returns 0. With this change, Random.raw_seed(0) consistently retuns "" in any UNIX. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--random.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d4a33d1033..9b2ee89dc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 5 08:31:02 2015 Rei Odaira <Rei.Odaira@gmail.com>
+
+ * random.c (random_raw_seed): Avoid calling fill_random_bytes()
+ if the requested size is 0. AIX returns -1 for 0-byte read from
+ /dev/urandom, while other UNIX returns 0. With this change,
+ Random.raw_seed(0) consistently retuns "" in any UNIX.
+
Wed Mar 4 12:43:32 2015 Kazuki Tanaka <gogotanaka@ruby-lang.org>
* test/ruby/test_math.rb (assert_float_and_int): Refactor test cases
diff --git a/random.c b/random.c
index 82111ce69e..fed85e0a47 100644
--- a/random.c
+++ b/random.c
@@ -580,6 +580,7 @@ random_raw_seed(VALUE self, VALUE size)
{
long n = NUM2ULONG(size);
VALUE buf = rb_str_new(0, n);
+ if (n == 0) return buf;
if (fill_random_bytes(RSTRING_PTR(buf), n)) return Qnil;
return buf;
}