aniani/icecast-server
0
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-06-30 22:18:19 -04:00
Code

Fix: Migrated from fopen/fread/fclose to open/read/close for reading files

Browse Source 
stdio may buffer the input and may read to far ahead. This is not a good
idea with high quality PRNG devices as it may take significant time to
do so, and remove entropy that will just be discarded.
This commit is contained in:
Philipp Schafft 2020-10-22 07:49:45 +00:00
parent 8c567e5005
commit 6d91c12acf
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/prng.c
View File

@ -13,6 +13,9 @@
#include <config.h> #include <config.h>
#endif #endif
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -233,21 +236,25 @@ int prng_read_file(const char *filename, ssize_t len)
{ {
char buffer[BLOCK_LENGTH*16]; char buffer[BLOCK_LENGTH*16];
size_t done = 0; size_t done = 0;
FILE *file; int fh;
if (len < 0 || len > 1048576) if (len < 0 || len > 1048576)
len = 1048576; len = 1048576;
file = fopen(filename, "rb"); #ifdef O_CLOEXEC
if (!file) fh = open(filename, O_RDONLY|O_CLOEXEC, 0);
#else
fh = open(filename, O_RDONLY, 0);
#endif
if (fh < 0)
return -1; return -1;
while (done < (size_t)len) { while (done < (size_t)len) {
size_t todo = (size_t)len < sizeof(buffer) ? (size_t)len : sizeof(buffer); size_t todo = (size_t)len < sizeof(buffer) ? (size_t)len : sizeof(buffer);
size_t res = fread(buffer, 1, todo, file); size_t res = read(fh, buffer, todo);
if (res < 1) { if (res < 1) {
fclose(file); close(fh);
return 0; return 0;
} }
@ -256,6 +263,6 @@ int prng_read_file(const char *filename, ssize_t len)
done += res; done += res;
} }
fclose(file); close(fh);
return 0; return 0;
} }