From f6a0d5498b5f0d62e10f7ba891bc6ea5e20dad69 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 9 Jan 2022 23:53:55 +0000
Subject: vim-patch:8.1.2343: using time() for srand() is not very random

Problem:    Using time() for srand() is not very random.
Solution:   use /dev/urandom if available
https://github.com/vim/vim/commit/07e4a197953d12902fb97beb48830a5323a52280

Use os_open and os_close.

time_settime is N/A, so some parts of the test are disabled.

There's maybe a very, very, very, very small chance the /dev/urandom test fails,
but it shouldn't matter. :P
---
 src/nvim/eval/funcs.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'src/nvim/eval/funcs.c')

diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 96d8c93db3..6a0803704d 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -10528,16 +10528,44 @@ static void f_stdpath(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 /// "srand()" function
 static void f_srand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
+  static int dev_urandom_state = -1;  // FAIL or OK once tried
+
   tv_list_alloc_ret(rettv, 4);
   if (argvars[0].v_type == VAR_UNKNOWN) {
-    tv_list_append_number(rettv->vval.v_list, (varnumber_T)time(NULL));
+    if (dev_urandom_state != FAIL) {
+      const int fd = os_open("/dev/urandom", O_RDONLY, 0);
+      struct {
+        union {
+          uint32_t number;
+          char bytes[sizeof(uint32_t)];
+        } cont;
+      } buf;
+
+      // Attempt reading /dev/urandom.
+      if (fd == -1) {
+        dev_urandom_state = FAIL;
+      } else {
+        buf.cont.number = 0;
+        if (read(fd, buf.cont.bytes, sizeof(uint32_t)) != sizeof(uint32_t)) {
+          dev_urandom_state = FAIL;
+        } else {
+          dev_urandom_state = OK;
+          tv_list_append_number(rettv->vval.v_list, (varnumber_T)buf.cont.number);
+        }
+        os_close(fd);
+      }
+    }
+    if (dev_urandom_state != OK) {
+      // Reading /dev/urandom doesn't work, fall back to time().
+      tv_list_append_number(rettv->vval.v_list, (varnumber_T)time(NULL));
+    }
   } else {
     bool error = false;
     const uint32_t x = tv_get_number_chk(&argvars[0], &error);
     if (error) {
       return;
     }
-    tv_list_append_number(rettv->vval.v_list, x);
+    tv_list_append_number(rettv->vval.v_list, (varnumber_T)x);
   }
   tv_list_append_number(rettv->vval.v_list, 362436069);
   tv_list_append_number(rettv->vval.v_list, 521288629);
-- 
cgit