[Bf-blender-cvs] [61d6fa9] master: Correct recent error passing NULL to fclose

[Campbell Barton]

Commit: 61d6fa92c5c91b1a7ed86d942b3b8e5f09fa4106
Author: Campbell Barton
Date:   Tue Dec 29 01:00:25 2015 +1100
Branches: master
https://developer.blender.org/rB61d6fa92c5c91b1a7ed86d942b3b8e5f09fa4106

Correct recent error passing NULL to fclose

===================================================================

M       source/blender/blenlib/intern/storage.c

===================================================================

diff --git a/source/blender/blenlib/intern/storage.c 
b/source/blender/blenlib/intern/storage.c
index 91df103..260a23c 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -320,10 +320,11 @@ void *BLI_file_read_text_as_mem(const char *filepath, 
size_t pad_bytes, size_t *
                }
 
                *r_size = filelen_read;
-       }
 
 finally:
-       fclose(fp);
+               fclose(fp);
+       }
+
        return mem;
 }
 
@@ -353,10 +354,11 @@ void *BLI_file_read_binary_as_mem(const char *filepath, 
size_t pad_bytes, size_t
                }
 
                *r_size = filelen_read;
-       }
 
 finally:
-       fclose(fp);
+               fclose(fp);
+       }
+
        return mem;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs