[Bf-blender-cvs] [46dd04f] master: Fix incorrect strncat use

Campbell Barton noreply at git.blender.org
Tue Mar 22 17:54:00 CET 2016


Commit: 46dd04faed2c6718b3d1f9d7a72bd246c66909e1
Author: Campbell Barton
Date:   Wed Mar 23 03:54:04 2016 +1100
Branches: master
https://developer.blender.org/rB46dd04faed2c6718b3d1f9d7a72bd246c66909e1

Fix incorrect strncat use

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

M	source/blender/editors/space_file/file_ops.c

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

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index ddb8b1c..d83a7d5 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1374,8 +1374,8 @@ int file_exec(bContext *C, wmOperator *exec_op)
 			BLI_parent_dir(sfile->params->dir);
 		}
 		else {
-			BLI_cleanup_dir(G.main->name, sfile->params->dir);
-			strncat(sfile->params->dir, file->relpath, sizeof(sfile->params->dir));
+			BLI_cleanup_path(G.main->name, sfile->params->dir);
+			BLI_path_append(sfile->params->dir, sizeof(sfile->params->dir) - 1, file->relpath);
 			BLI_add_slash(sfile->params->dir);
 		}




More information about the Bf-blender-cvs mailing list