[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34092] trunk/blender/source/blender/ makesdna/intern/dna_genfile.c: Fixing bugs in future:

Ton Roosendaal ton at blender.org
Wed Jan 5 11:54:30 CET 2011


Revision: 34092
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34092
Author:   ton
Date:     2011-01-05 11:54:30 +0100 (Wed, 05 Jan 2011)

Log Message:
-----------
Fixing bugs in future: 

DNA reconstruct now terminates strings, when the new string
in a file is longer than in current definition. This will
enable a safer ID and other name lengthening, keeping at
least some forward compitability.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/intern/dna_genfile.c

Modified: trunk/blender/source/blender/makesdna/intern/dna_genfile.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/dna_genfile.c	2011-01-05 10:40:38 UTC (rev 34091)
+++ trunk/blender/source/blender/makesdna/intern/dna_genfile.c	2011-01-05 10:54:30 UTC (rev 34092)
@@ -869,6 +869,10 @@
 					mul= len/oldsize;
 					mul*= (cursize < oldsize)? cursize: oldsize;
 					memcpy(curdata, olddata, mul);
+					
+					/* terminate strings */
+					if(oldsize > cursize && strcmp(type, "char")==0)
+						curdata[mul-1]= 0;
 				}
 				else {
 					if(cursize>oldsize) cast_elem(type, otype, oname, curdata, olddata);





More information about the Bf-blender-cvs mailing list