Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-10-08 17:08:00 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-10-08 17:08:00 +0300
commit9ea2a7c02ddd8fc949b5917e53ee75af11012b6a (patch)
tree3702edcea94c3c73e8ccb5ffd5b8bab3d298d923
parentcdb0b3b1dcd4e9962426422868b2f40535670a5c (diff)
Fix potential string buffer overruns.
Note that our library path handling is still rather dodgy on this regards, shall take some time at some point to seriously sanitize it...
-rw-r--r--source/blender/editors/space_file/file_ops.c4
-rw-r--r--source/blender/windowmanager/intern/wm_files_link.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index ab1bcbaa8b5..22c1214d928 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -2203,7 +2203,7 @@ static int file_rename_poll(bContext *C)
poll = false;
}
else {
- char dir[FILE_MAX];
+ char dir[FILE_MAX_LIBEXTRA];
if (filelist_islibrary(sfile->files, dir, NULL)) {
poll = false;
}
@@ -2235,7 +2235,7 @@ static int file_delete_poll(bContext *C)
SpaceFile *sfile = CTX_wm_space_file(C);
if (sfile && sfile->params) {
- char dir[FILE_MAX];
+ char dir[FILE_MAX_LIBEXTRA];
int numfiles = filelist_files_ensure(sfile->files);
int i;
int num_selected = 0;
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index f19c999a4f1..7e6c6160b84 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -282,7 +282,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
PropertyRNA *prop;
WMLinkAppendData *lapp_data;
- char path[FILE_MAX_LIBEXTRA], root[FILE_MAXDIR], libname[FILE_MAX], relname[FILE_MAX];
+ char path[FILE_MAX_LIBEXTRA], root[FILE_MAXDIR], libname[FILE_MAX_LIBEXTRA], relname[FILE_MAX];
char *group, *name;
int totfiles = 0;
short flag;