generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[libc++] random_device fails if open returns zero

Browse Source 
random_device::random_device(const string&) wrongly assumes that open
can only validly return a file descriptor greater than zero.

This results in random_device believing that it didn't successfully open
the device causing it to throw in it's constructor, this ends up leaking
a file descriptor.

The fix is simple, don't error on file descriptors which are zero.


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@210060 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2014-06-03 02:21:37 +00:00
parent d2f0b5c9ae
commit 8db32cc2ac
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/random.cpp
View File

@ -49,7 +49,7 @@ random_device::operator()()
random_device::random_device(const string& __token)
: __f_(open(__token.c_str(), O_RDONLY))
{
if (__f_ <= 0)
if (__f_ < 0)
__throw_system_error(errno, ("random_device failed to open " + __token).c_str());
}

11
test/numerics/rand/rand.device/ctor.pass.cpp
View File

@ -15,6 +15,7 @@
#include <random>
#include <cassert>
#include <unistd.h>
int main()
{
@ -29,6 +30,16 @@ int main()
{
std::random_device r;
}
{
int ec;
ec = close(STDIN_FILENO);
assert(!ec);
ec = close(STDOUT_FILENO);
assert(!ec);
ec = close(STDERR_FILENO);
assert(!ec);
std::random_device r;
}
{
std::random_device r("/dev/urandom");;
}