Commit: da6578e647a749a464e524d3cfe8b11ac66c424f
Author: Bastien Montagne
Date: Fri Nov 27 21:15:00 2015 +0100
Branches: master
https://developer.blender.org/rBda6578e647a749a464e524d3cfe8b11ac66c424f
Fix T46827: Appending Specific Groups Doesn't Work on Windows.
Issue was with datablocks which names would include '/', new filebrowser
filelisting code
would cleanup the entire filepath, hence giving invalid filename in this case.
That 'path separator in ID names' bit us already in lib/datatype/datablock
separating func,
this is really stupid to allow that in something handled as a filepath imho,
but well...
Note: would have break the same under *nix with '\' char.
===================================================================
M source/blender/editors/space_file/filelist.c
===================================================================
diff --git a/source/blender/editors/space_file/filelist.c
b/source/blender/editors/space_file/filelist.c
index 7f405e8..85d92d0 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -2444,6 +2444,7 @@ static void filelist_readjob_do(
bool is_lib = do_lib;
char *subdir;
+ char rel_subdir[FILE_MAX_LIBEXTRA];
int recursion_level;
bool skip_currpar;
@@ -2454,6 +2455,14 @@ static void filelist_readjob_do(
BLI_stack_discard(todo_dirs);
+ /* ARRRG! We have to be very careful *not to use* common
BLI_path_util helpers over entry->relpath itself
+ * (nor any path containing it), since it may actually be a
datablock name inside .blend file,
+ * which can have slashes and backslashes! See T46827.
+ * Note that in the end, this means we 'cache' valid relative
subdir once here, this is actually better. */
+ BLI_strncpy(rel_subdir, subdir, sizeof(rel_subdir));
+ BLI_cleanup_dir(root, rel_subdir);
+ BLI_path_rel(rel_subdir, root);
+
if (do_lib) {
nbr_entries = filelist_readjob_list_lib(subdir,
&entries, skip_currpar);
}
@@ -2463,8 +2472,7 @@ static void filelist_readjob_do(
}
for (entry = entries.first; entry; entry = entry->next) {
- BLI_join_dirfile(dir, sizeof(dir), subdir,
entry->relpath);
- BLI_cleanup_file(root, dir);
+ BLI_join_dirfile(dir, sizeof(dir), rel_subdir,
entry->relpath);
/* Generate our entry uuid. Abusing uuid as an uint32,
shall be more than enough here,
* things would crash way before we overflow that
counter!
@@ -2473,10 +2481,9 @@ static void filelist_readjob_do(
* remain consistent about threading! */
*((uint32_t *)entry->uuid) =
atomic_add_uint32((uint32_t *)filelist->filelist_intern.curr_uuid, 1);
- BLI_path_rel(dir, root);
/* Only thing we change in direntry here, so we need to
free it first. */
MEM_freeN(entry->relpath);
- entry->relpath = BLI_strdup(dir + 2); /* + 2 to remove
'//' added by BLI_path_rel */
+ entry->relpath = BLI_strdup(dir + 2); /* + 2 to remove
'//' added by BLI_path_rel to rel_subdir */
entry->name = BLI_strdup(fileentry_uiname(root,
entry->relpath, entry->typeflag, dir));
/* Here we decide whether current filedirentry is to be
listed too, or not. */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
