From ee9d60b033409bea77106d15f87631ad601b9f89 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Dec 2015 17:45:46 +1100 Subject: Remove feof check for file reading This wasnt correct since we're not reading past the stream, though it worked on Linux and some Windows systems. --- source/blender/blenlib/intern/storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 5c300e94097..91df103bc7b 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -306,7 +306,7 @@ void *BLI_file_read_text_as_mem(const char *filepath, size_t pad_bytes, size_t * } const long int filelen_read = fread(mem, 1, filelen, fp); - if ((filelen_read < 0) || (!feof(fp) ) || ferror(fp)) { + if ((filelen_read < 0) || ferror(fp)) { MEM_freeN(mem); mem = NULL; goto finally; @@ -346,7 +346,7 @@ void *BLI_file_read_binary_as_mem(const char *filepath, size_t pad_bytes, size_t } const long int filelen_read = fread(mem, 1, filelen, fp); - if ((filelen_read != filelen) || (!feof(fp) ) || ferror(fp)) { + if ((filelen_read != filelen) || ferror(fp)) { MEM_freeN(mem); mem = NULL; goto finally; -- cgit v1.2.3