From: Otto Moerbeek Date: Tue, 13 Jun 2023 11:02:36 +0000 (+0200) Subject: Fix loops X-Git-Tag: rec-5.0.0-alpha1~170^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4add9e26d0e94927fd00863690e5df9220f75aa5;p=thirdparty%2Fpdns.git Fix loops --- diff --git a/pdns/dns_random.cc b/pdns/dns_random.cc index 9d3e34edc4..a8eb266c0c 100644 --- a/pdns/dns_random.cc +++ b/pdns/dns_random.cc @@ -256,6 +256,7 @@ uint32_t dns_random_uint32() if (got != sizeof(num)) { throw std::runtime_error("getrandom() failed: " + stringerror()); } + break; } while (true); return num; #else @@ -289,6 +290,7 @@ uint32_t dns_random_uint32() attempts--; continue; } + break; } while (true); return num; } diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc index 6a126c8a49..db8a0eb0ab 100644 --- a/pdns/test-dns_random_hh.cc +++ b/pdns/test-dns_random_hh.cc @@ -18,7 +18,7 @@ using namespace boost::accumulators; -using acc_t = accumulator_set>; +using acc_t = accumulator_set>; BOOST_AUTO_TEST_SUITE(test_dns_random_hh) @@ -28,9 +28,9 @@ const std::vector rndSources = { #if defined(HAVE_GETRANDOM) "getrandom", #endif - #if defined(HAVE_ARC4RANDOM) +#if defined(HAVE_ARC4RANDOM) "arc4random", - #endif +#endif #if defined(HAVE_RANDOMBYTES_STIR) "sodium", #endif @@ -42,7 +42,6 @@ const std::vector rndSources = { #endif }; - BOOST_AUTO_TEST_CASE(test_dns_random_garbage) { @@ -127,7 +126,4 @@ BOOST_AUTO_TEST_CASE(test_dns_random_uint32_average) } } - BOOST_AUTO_TEST_SUITE_END() - -