Ver Fonte

Fix assertion failure in SimpleRandomizer::getRandomBytes

errno might not be initialized to 0, and we may get both rv == -1 and
errno != ENOSYS.  This leads to assertion failure.  Since
getrandom_linux always returns -1 on failure, checking errno is
useless in this function.
Tatsuhiro Tsujikawa há 8 anos atrás
pai
commit
e2dc0902bb
1 ficheiros alterados com 1 adições e 12 exclusões
  1. 1 12
      src/SimpleRandomizer.cc

+ 1 - 12
src/SimpleRandomizer.cc

@@ -101,18 +101,7 @@ void SimpleRandomizer::getRandomBytes(unsigned char* buf, size_t len)
   static bool have_random_support = true;
   if (have_random_support) {
     auto rv = getrandom_linux(buf, len);
-    if (rv != -1
-#ifdef ENOSYS
-        /* If the system does not know ENOSYS at this point, just leave the
-         * check out. If the call failed, we'll not take this branch at all
-         * and disable support below.
-         */
-        || errno != ENOSYS
-#endif
-        ) {
-      if (rv < -1) {
-        A2_LOG_ERROR(fmt("Failed to produce randomness: %d", errno));
-      }
+    if (rv != -1) {
       // getrandom is not supposed to fail, ever, so, we want to assert here.
       assert(rv >= 0 && (size_t)rv == len);
       return;