github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
pull/823/head
Tatsuhiro Tsujikawa 2017-01-06 22:22:14 +09:00
parent 5d2742da15
commit e2dc0902bb
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SimpleRandomizer.cc
View File

@ -101,18 +101,7 @@ void SimpleRandomizer::getRandomBytes(unsigned char* buf, size_t len)
static bool have_random_support = true; static bool have_random_support = true;
if (have_random_support) { if (have_random_support) {
auto rv = getrandom_linux(buf, len); auto rv = getrandom_linux(buf, len);
if (rv != -1 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));
}
// getrandom is not supposed to fail, ever, so, we want to assert here. // getrandom is not supposed to fail, ever, so, we want to assert here.
assert(rv >= 0 && (size_t)rv == len); assert(rv >= 0 && (size_t)rv == len);
return; return;