[Bf-blender-cvs] [3df587b798a] blender-v3.0-release: Fix T92681: resolve use of freed filedescriptor in debug builds

[Martijn Versteegh]

Commit: 3df587b798a4dc33df0311ca3793f3c4aa441c72
Author: Martijn Versteegh
Date:   Mon Nov 1 21:43:18 2021 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rB3df587b798a4dc33df0311ca3793f3c4aa441c72

Fix T92681: resolve use of freed filedescriptor in debug builds

Ref D13053

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

M       source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c 
b/source/blender/blenloader/intern/readfile.c
index 600abcca818..e4fe3e8da00 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1351,7 +1351,6 @@ FileData *blo_filedata_from_memfile(MemFile *memfile,
 void blo_filedata_free(FileData *fd)
 {
   if (fd) {
-    fd->file->close(fd->file);
 
     /* Free all BHeadN data blocks */
 #ifndef NDEBUG
@@ -1365,6 +1364,7 @@ void blo_filedata_free(FileData *fd)
       MEM_freeN(new_bhead);
     }
 #endif
+    fd->file->close(fd->file);
 
     if (fd->filesdna) {
       DNA_sdna_free(fd->filesdna);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs