diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-02 07:59:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-02 07:59:00 +0400 |
commit | de36dd1e99476f311055a4ac62aacc3cdbda193b (patch) | |
tree | 9035b7cd8fc2d97f4689c07454adadf6e6244ad9 /source/blender/makesdna/intern/makesdna.c | |
parent | dd2db3703f4d3b36e33aa0cec31aea697227ba89 (diff) | |
parent | f45dcf022db02272d495ddfb07ffffe50e3f7f70 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22099:22130
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 87ceef36dfb..cae28f163ed 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -485,15 +485,18 @@ static void *read_file_data(char *filename, int *len_r) data= MEM_mallocN(*len_r, "read_file_data"); if (!data) { *len_r= -1; + fclose(fp); return NULL; } if (fread(data, *len_r, 1, fp)!=1) { *len_r= -1; MEM_freeN(data); + fclose(fp); return NULL; } - + + fclose(fp); return data; } |