Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-12-23 09:45:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-23 09:45:46 +0300
commitee9d60b033409bea77106d15f87631ad601b9f89 (patch)
tree1d3b3077dea86b5f8192f0264378168593f13b95
parente74a023309cf06986e6aa855b25fd9b2de989297 (diff)
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.
-rw-r--r--source/blender/blenlib/intern/storage.c4
1 files 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;