[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31273] trunk/blender/source/blender/ blenlib/intern/path_util.c: bugfix [#23263] Changing view crashes blender

Campbell Barton ideasman42 at gmail.com
Thu Aug 12 05:37:47 CEST 2010


Revision: 31273
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31273
Author:   campbellbarton
Date:     2010-08-12 05:37:45 +0200 (Thu, 12 Aug 2010)

Log Message:
-----------
bugfix [#23263] Changing view crashes blender

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/path_util.c

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2010-08-12 02:24:12 UTC (rev 31272)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2010-08-12 03:37:45 UTC (rev 31273)
@@ -586,7 +586,7 @@
 		BLI_strncpy(tmp, path, FILE_MAX);
 	}
 #else
-	BLI_strncpy(tmp, path, FILE_MAX);
+	BLI_strncpy(tmp, path, sizeof(tmp));
 	
 	/* Check for loading a windows path on a posix system
 	 * in this case, there is no use in trying C:/ since it 
@@ -603,7 +603,7 @@
 	
 #endif
 
-	BLI_strncpy(base, basepath, FILE_MAX);
+	BLI_strncpy(base, basepath, sizeof(base));
 	
 	BLI_cleanup_file(NULL, base);
 	
@@ -626,13 +626,13 @@
 			BLI_strncpy(path, tmp+2, FILE_MAX);
 			
 			memcpy(tmp, base, baselen);
-			strcpy(tmp+baselen, path);
-			strcpy(path, tmp);
+			BLI_strncpy(tmp+baselen, path, sizeof(tmp)-baselen);
+			BLI_strncpy(path, tmp, FILE_MAX);
 		} else {
-			strcpy(path, tmp+2);
+			BLI_strncpy(path, tmp+2, FILE_MAX);
 		}
 	} else {
-		strcpy(path, tmp);
+		BLI_strncpy(path, tmp, FILE_MAX);
 	}
 	
 	if (path[0]!='\0') {
@@ -1162,7 +1162,7 @@
 {
 	char di[FILE_MAXDIR+FILE_MAXFILE], fi[FILE_MAXFILE];
 
-	strcpy(di, name);
+	BLI_strncpy(di, name, sizeof(di));
 	BLI_splitdirstring(di, fi);
 	
 	/* test exist */





More information about the Bf-blender-cvs mailing list