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

libwebm: Fix random number generation on Android.

Browse Source 
Change-Id: I593561128aaeb5806f8f015e2de3b4c9aa4411fc
This commit is contained in:
Frank Galligan 2013-04-15 09:27:34 -07:00
parent 252bd24950
commit d5cb6c7fa4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mkvmuxerutil.cpp
View File

@ -8,6 +8,10 @@
#include "mkvmuxerutil.hpp" #include "mkvmuxerutil.hpp"
#ifdef __ANDROID__
#include <fcntl.h>
#endif
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
#ifdef _WIN32 #ifdef _WIN32
@ -511,12 +515,21 @@ mkvmuxer::uint64 mkvmuxer::MakeUID(unsigned int* seed) {
for (int i = 0; i < 7; ++i) { // avoid problems with 8-byte values for (int i = 0; i < 7; ++i) { // avoid problems with 8-byte values
uid <<= 8; uid <<= 8;
// TODO(fgalligan): Move random number generation to platform specific code.
#ifdef _WIN32 #ifdef _WIN32
(void)seed; (void)seed;
unsigned int random_value; unsigned int random_value;
const errno_t e = rand_s(&random_value); const errno_t e = rand_s(&random_value);
(void)e; (void)e;
const int32 nn = random_value; const int32 nn = random_value;
#elif __ANDROID__
int32 temp_num = 1;
int fd = open("/dev/urandom", O_RDONLY);
if (fd != -1) {
read(fd, &temp_num, sizeof(int32));
close(fd);
}
const int32 nn = temp_num;
#else #else
const int32 nn = rand_r(seed); const int32 nn = rand_r(seed);
#endif #endif