griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

dumb mistake, wasnt UN-setting the flag to zero LIB_APPEND_TAX

Browse Source 
Fixed an error that could cause a possible memory corruption,
library filenames were being used to make a menu, but memory was only being allocated FILE_MAX per lib rather then FILE_MAXDIR+FILE_MAX, since lib->name is the full path. was also doing lib->name+2 which isnt needed for a path.
This commit is contained in:
Campbell Barton
2007-04-20 20:15:54 +00:00
parent c7b1e5c11d
commit cbfeab7e45
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/src/filesel.c
View File

@@ -1151,10 +1151,10 @@ static char *library_string(void)
int nr=0, tot= BLI_countlist(&G.main->library);
if(tot==0) return NULL;
str= MEM_callocN(tot*(FILE_MAX), "filesel lib menu");
str= MEM_callocN(tot*(FILE_MAXDIR+FILE_MAX), "filesel lib menu");
for(tot=0, lib= G.main->library.first; lib; lib= lib->id.next, nr++) {
tot+= sprintf(str+tot, "%s %%x%d|", lib->name+2, nr);
tot+= sprintf(str+tot, "%s %%x%d|", lib->name, nr);
}
return str;
}
@@ -2422,8 +2422,7 @@ static void do_library_append(SpaceFile *sfile)
all_local(lib, 1);
/* important we unset, otherwise these object wont
* link into other scenes from this blend file */
flag_all_listbases_ids(LIB_APPEND_TAG, 1);
flag_all_listbases_ids(LIB_APPEND_TAG, 0);
}
DAG_scene_sort(G.scene);