rand/rand.c (rand_getgood): Stretch the output buffer if necessary.

[catacomb] / rand / rand.c

diff --git a/rand/rand.c b/rand/rand.c
index 6787c11..e2211d5 100644 (file)
--- a/rand/rand.c
+++ b/rand/rand.c
@@ -482,11 +482,15 @@ void rand_getgood(rand_pool *r, void *p, size_t sz)
        chunk = r->obits / 8;
     }
 
-    if (chunk + r->o > RAND_BUFSZ)
+    if (chunk + r->o <= RAND_BUFSZ) {
+      memcpy(o, r->buf + r->o, chunk);
+      r->o += chunk;
+    } else {
       chunk = RAND_BUFSZ - r->o;
+      memcpy(o, r->buf + r->o, chunk);
+      rand_stretch(r);
+    }
 
-    memcpy(o, r->buf + r->o, chunk);
-    r->o += chunk;
     r->obits -= chunk * 8;
     o += chunk;
     sz -= chunk;