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;
 }