Commit: 4e191029640fad73003642a223de7e59341f3484
Author: Bastien Montagne
Date: Fri Dec 26 19:53:42 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB4e191029640fad73003642a223de7e59341f3484
Fix a mem leak in file listing threaded code, and another bug in fsmenu.c (new
named bookmarks).
===================================================================
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/fsmenu.c
===================================================================
diff --git a/source/blender/editors/space_file/filelist.c
b/source/blender/editors/space_file/filelist.c
index 8c844a9..534e6b4 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1908,10 +1908,12 @@ static void filelist_readjob_free(void *flrjv)
FileListReadJob *flrj = flrjv;
if (flrj->tmp_filelist) {
- filelist_freelib(flrj->tmp_filelist);
- filelist_free(flrj->tmp_filelist);
/* tmp_filelist shall never ever be filtered! */
BLI_assert(flrj->tmp_filelist->fidx == NULL);
+
+ filelist_freelib(flrj->tmp_filelist);
+ filelist_free(flrj->tmp_filelist);
+ MEM_freeN(flrj->tmp_filelist);
}
BLI_mutex_end(&flrj->lock);
diff --git a/source/blender/editors/space_file/fsmenu.c
b/source/blender/editors/space_file/fsmenu.c
index 653c621..deddbef 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -353,6 +353,8 @@ void fsmenu_read_bookmarks(struct FSMenu *fsmenu, const
char *filename)
fp = BLI_fopen(filename, "r");
if (!fp) return;
+ name[0] = '\0';
+
while (fgets(line, sizeof(line), fp) != NULL) { /* read a line */
if (strncmp(line, "[Bookmarks]", 11) == 0) {
category = FS_CATEGORY_BOOKMARKS;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
