---

yaml
---
r: 22752
b: refs/heads/master
c: 60d682b
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4378e7ead19b48bc13cb196e3926a8cda3432ec8
+refs/heads/master: 60d682b57759a4fd3b6f666963e40ba457c2e4fc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rt/rust_builtin.cpp

@@ -182,7 +182,7 @@ rand_seed() {
     rust_vec *v = (rust_vec *) task->kernel->malloc(vec_size<uint8_t>(size),
                                             "rand_seed");
     v->fill = v->alloc = size;
-    isaac_seed(task->kernel, (uint8_t*) &v->data);
+    isaac_seed(task->kernel, (uint8_t*) &v->data, size);
     return v;
 }
 

trunk/src/rt/rust_util.h

@@ -128,9 +128,8 @@ inline size_t get_box_size(size_t body_size, size_t body_align) {
 
 // Initialization helpers for ISAAC RNG
 
-inline void isaac_seed(rust_kernel* kernel, uint8_t* dest)
+inline void isaac_seed(rust_kernel* kernel, uint8_t* dest, size_t size)
 {
-    size_t size = sizeof(ub4) * RANDSIZ;
 #ifdef __WIN32__
     HCRYPTPROV hProv;
     kernel->win32_require
@@ -144,8 +143,14 @@ inline void isaac_seed(rust_kernel* kernel, uint8_t* dest)
 #else
     int fd = open("/dev/urandom", O_RDONLY);
     assert(fd > 0);
-    assert(read(fd, dest, size) == (int) size);
-    assert(close(fd) == 0);
+    size_t amount = 0;
+    do {
+        ssize_t ret = read(fd, dest+amount, size-amount);
+        assert(ret >= 0);
+        amount += (size_t)ret;
+    } while (amount < size);
+    int ret = close(fd);
+    assert(ret == 0);
 #endif
 }
 
@@ -167,7 +172,7 @@ isaac_init(rust_kernel *kernel, randctx *rctx, rust_vec_box* user_seed)
             seed = (seed + 0x7ed55d16) + (seed << 12);
         }
     } else {
-        isaac_seed(kernel, (uint8_t*) &rctx->randrsl);
+        isaac_seed(kernel, (uint8_t*) &rctx->randrsl, sizeof(rctx->randrsl));
     }
 
     randinit(rctx, 1);