From 3329b6b6aa1ded34a7b3dcd3e597e877b34b4fbd Mon Sep 17 00:00:00 2001 From: Dustin Laurence Date: Wed, 16 Jul 2014 08:06:15 -0500 Subject: [PATCH] Test fread return value --- .gitignore | 2 ++ rand.c | 10 +++++++--- rand.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index eca727cdd5..d0ebc6ee08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.o +*.exe +*~ test-openssl tests diff --git a/rand.c b/rand.c index bc9c720431..cf5dec110c 100644 --- a/rand.c +++ b/rand.c @@ -22,6 +22,7 @@ */ #include +#include #include "rand.h" @@ -35,11 +36,14 @@ void init_rand(void) uint32_t random32(void) { uint32_t r; - fread(&r, 1, sizeof(r), f); + size_t len = sizeof(r); + size_t len_read = fread(&r, 1, len, f); + assert(len_read == len); return r; } -void random_buffer(uint8_t *buf, uint32_t len) +void random_buffer(uint8_t *buf, size_t len) { - fread(buf, 1, len, f); + size_t len_read = fread(buf, 1, len, f); + assert(len_read == len); } diff --git a/rand.h b/rand.h index 3d49e68dbd..fb80ea43b8 100644 --- a/rand.h +++ b/rand.h @@ -28,6 +28,6 @@ void init_rand(void); uint32_t random32(void); -void random_buffer(uint8_t *buf, uint32_t len); +void random_buffer(uint8_t *buf, size_t len); #endif