[Bf-blender-cvs] [9ea2a7c02dd] master: Fix potential string buffer overruns.

Bastien Montagne noreply at git.blender.org
Sun Oct 8 16:15:51 CEST 2017


Commit: 9ea2a7c02ddd8fc949b5917e53ee75af11012b6a
Author: Bastien Montagne
Date:   Sun Oct 8 16:08:00 2017 +0200
Branches: master
https://developer.blender.org/rB9ea2a7c02ddd8fc949b5917e53ee75af11012b6a

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...

===================================================================

M	source/blender/editors/space_file/file_ops.c
M	source/blender/windowmanager/intern/wm_files_link.c

===================================================================

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;



More information about the Bf-blender-cvs mailing list