From 3b5aba8cf8f67aa7feed96141347bb9bfc72b247 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 2 May 2023 21:13:20 +1000 Subject: [PATCH] Fix invalid argument to BLI_path_split_dir_file get_index_dir passed in the wrong size, also remove strange use of BLI_path_split_dir_file which copied the directory into `file`, only to overwrite it with the `file` afterwards. --- source/blender/imbuf/intern/indexer.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blender/imbuf/intern/indexer.cc b/source/blender/imbuf/intern/indexer.cc index e956ccfad80..a1fdea5d967 100644 --- a/source/blender/imbuf/intern/indexer.cc +++ b/source/blender/imbuf/intern/indexer.cc @@ -383,7 +383,7 @@ static void get_index_dir(struct anim *anim, char *index_dir, size_t index_dir_l if (!anim->index_dir[0]) { char filename[FILE_MAXFILE]; char dirname[FILE_MAXDIR]; - BLI_path_split_dir_file(anim->name, dirname, index_dir_len, filename, sizeof(filename)); + BLI_path_split_dir_file(anim->name, dirname, sizeof(dirname), filename, sizeof(filename)); BLI_path_join(index_dir, index_dir_len, dirname, "BL_proxy", filename); } else { @@ -393,9 +393,7 @@ static void get_index_dir(struct anim *anim, char *index_dir, size_t index_dir_l void IMB_anim_get_fname(struct anim *anim, char *file, int size) { - char filename[FILE_MAXFILE]; - BLI_path_split_dir_file(anim->name, file, size, filename, sizeof(filename)); - BLI_strncpy(file, filename, size); + BLI_path_split_file_part(anim->name, file, size); } static bool get_proxy_filepath(struct anim *anim,