RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-21 15:00:27 +00:00
Code Issues Projects Releases Wiki Activity

avutil/random_seed: use fread() in read_random()

Browse Source 
This ensures the requested amount of bytes is read.
Also remove /dev/random as it's no longer necessary.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-07-04 19:37:04 -03:00
parent a357758ec5
commit 7a1128ca07
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavutil/random_seed.c
View File

@ -49,17 +49,20 @@
static int read_random(uint32_t *dst, const char *file)
{
#if HAVE_UNISTD_H
int fd = avpriv_open(file, O_RDONLY);
int err = -1;
FILE *fp = avpriv_fopen_utf8(file, "r");
size_t err;
if (fd == -1)
return -1;
err = read(fd, dst, sizeof(*dst));
close(fd);
if (!fp)
return AVERROR_UNKNOWN;
err = fread(dst, 1, sizeof(*dst), fp);
fclose(fp);
return err;
if (err != sizeof(*dst))
return AVERROR_UNKNOWN;
return 0;
#else
return -1;
return AVERROR(ENOSYS);
#endif
}
@ -138,9 +141,7 @@ uint32_t av_get_random_seed(void)
return arc4random();
#endif
if (read_random(&seed, "/dev/urandom") == sizeof(seed))
return seed;
if (read_random(&seed, "/dev/random") == sizeof(seed))
if (!read_random(&seed, "/dev/urandom"))
return seed;
return get_generic_seed();
}