[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31511] trunk/blender/source/blender/ blenkernel/intern/library.c: own commit to fix a naming bug caused a new bug.
Campbell Barton
ideasman42 at gmail.com
Sun Aug 22 09:11:44 CEST 2010
Revision: 31511
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31511
Author: campbellbarton
Date: 2010-08-22 09:11:40 +0200 (Sun, 22 Aug 2010)
Log Message:
-----------
own commit to fix a naming bug caused a new bug.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/library.c
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2010-08-22 06:31:26 UTC (rev 31510)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2010-08-22 07:11:40 UTC (rev 31511)
@@ -1094,8 +1094,14 @@
left_len= splitIDname(name, left, &nr);
/* if new name will be too long, truncate it */
- if(nr>999 && strlen(left)>16) left[16]= 0;
- else if(strlen(left)>17) left[17]= 0;
+ if(nr > 999 && left_len > 16) {
+ left[16]= 0;
+ left_len= 16;
+ }
+ else if(left_len > 17) {
+ left[17]= 0;
+ left_len= 17;
+ }
for(idtest= lb->first; idtest; idtest= idtest->next) {
if( (id != idtest) &&
@@ -1136,10 +1142,11 @@
/* otherwise just continue and use a number suffix */
}
- if(nr > 999 && strlen(left) > 16) {
+ if(nr > 999 && left_len > 16) {
/* this would overflow name buffer */
left[16] = 0;
- strcpy( name, left );
+ /* left_len = 16; */ /* for now this isnt used again */
+ memcpy(name, left, sizeof(char) * 16);
continue;
}
/* this format specifier is from hell... */
More information about the Bf-blender-cvs
mailing list