[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19026] trunk/blender/source/blender: more uninitialized variables and auto-complete could copy a string over its self .
Campbell Barton
ideasman42 at gmail.com
Wed Feb 18 06:50:16 CET 2009
Revision: 19026
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19026
Author: campbellbarton
Date: 2009-02-18 06:49:51 +0100 (Wed, 18 Feb 2009)
Log Message:
-----------
more uninitialized variables and auto-complete could copy a string over its self.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/src/drawobject.c
trunk/blender/source/blender/src/interface.c
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2009-02-18 04:43:12 UTC (rev 19025)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2009-02-18 05:49:51 UTC (rev 19026)
@@ -2032,7 +2032,7 @@
fg.subversion= BLENDER_SUBVERSION;
fg.minversion= BLENDER_MINVERSION;
fg.minsubversion= BLENDER_MINSUBVERSION;
-
+ fg.pads= 0; /* prevent mem checkers from complaining */
writestruct(wd, GLOB, "FileGlobal", 1, &fg);
}
Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c 2009-02-18 04:43:12 UTC (rev 19025)
+++ trunk/blender/source/blender/src/drawobject.c 2009-02-18 05:49:51 UTC (rev 19026)
@@ -1096,14 +1096,15 @@
float *co = dl?dl->verts:NULL;
BPoint *bp = editLatt->def;
float pmat[4][4], vmat[4][4];
- short s[2];
+ short s[2] = {IS_CLIPPED, 0};
view3d_get_object_project_mat(curarea, G.obedit, pmat, vmat);
for (i=0; i<N; i++, bp++, co+=3) {
if (bp->hide==0) {
view3d_project_short_clip(curarea, dl?co:bp->vec, s, pmat, vmat);
- func(userData, bp, s[0], s[1]);
+ if (s[0] != IS_CLIPPED)
+ func(userData, bp, s[0], s[1]);
}
}
}
@@ -1303,7 +1304,7 @@
void nurbs_foreachScreenVert(void (*func)(void *userData, Nurb *nu, BPoint *bp, BezTriple *bezt, int beztindex, int x, int y), void *userData)
{
float pmat[4][4], vmat[4][4];
- short s[2];
+ short s[2] = {IS_CLIPPED, 0};
Nurb *nu;
int i;
@@ -1339,7 +1340,8 @@
if(bp->hide==0) {
view3d_project_short_clip(curarea, bp->vec, s, pmat, vmat);
- func(userData, nu, bp, NULL, -1, s[0], s[1]);
+ if (s[0] != IS_CLIPPED)
+ func(userData, nu, bp, NULL, -1, s[0], s[1]);
}
}
}
Modified: trunk/blender/source/blender/src/interface.c
===================================================================
--- trunk/blender/source/blender/src/interface.c 2009-02-18 04:43:12 UTC (rev 19025)
+++ trunk/blender/source/blender/src/interface.c 2009-02-18 05:49:51 UTC (rev 19026)
@@ -6083,12 +6083,13 @@
}
void autocomplete_end(AutoComplete *autocpl, char *autoname)
-{
+{
if(autocpl->truncate[0])
BLI_strncpy(autoname, autocpl->truncate, autocpl->maxlen);
- else
- BLI_strncpy(autoname, autocpl->startname, autocpl->maxlen);
-
+ else {
+ if (autoname != autocpl->startname) /* dont copy a string over its self */
+ BLI_strncpy(autoname, autocpl->startname, autocpl->maxlen);
+ }
MEM_freeN(autocpl->truncate);
MEM_freeN(autocpl);
}
More information about the Bf-blender-cvs
mailing list