tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

- fix leak on STL loading if realloc fails. 

- transform code was using sprintf reading and writing the same string (undefined behavior).
- softbody had unneeded NULL check.
This commit is contained in:
Campbell Barton 2011-02-12 14:25:54 +00:00
parent 6e47ffcc0d
commit c8c86aa6a1
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/exotic.c
View File

@ -364,10 +364,16 @@ static void read_stl_mesh_ascii(Scene *scene, const char *str)
* sure we have enough storage for some more faces
*/
if ( (totface) && ( (totface % 10000) == 0 ) ) {
float *vertdata_old= vertdata;
++numtenthousand;
vertdata = realloc(vertdata,
numtenthousand*3*30000*sizeof(float));
if (!vertdata) { STLALLOCERROR; }
if (!vertdata) {
if(vertdata_old) {
free(vertdata_old);
}
STLALLOCERROR;
}
}
/* Don't read normal, but check line for proper syntax anyway

4
source/blender/blenkernel/intern/softbody.c
View File

@ -1647,9 +1647,7 @@ static void scan_for_ext_spring_forces(Scene *scene, Object *ob, float timenow)
ListBase *do_effector = NULL;
do_effector = pdInitEffectors(scene, ob, NULL, sb->effector_weights);
if (sb){
_scan_for_ext_spring_forces(scene, ob, timenow, 0, sb->totspring, do_effector);
}
_scan_for_ext_spring_forces(scene, ob, timenow, 0, sb->totspring, do_effector);
pdEndEffectors(&do_effector);
}

18
source/blender/editors/transform/transform.c
View File

@ -2525,6 +2525,7 @@ void initResize(TransInfo *t)
static void headerResize(TransInfo *t, float vec[3], char *str) {
char tvec[60];
char *spos= str;
if (hasNumInput(&t->num)) {
outputNumInput(&(t->num), tvec);
}
@ -2537,24 +2538,27 @@ static void headerResize(TransInfo *t, float vec[3], char *str) {
if (t->con.mode & CON_APPLY) {
switch(t->num.idx_max) {
case 0:
sprintf(str, "Scale: %s%s %s", &tvec[0], t->con.text, t->proptext);
spos += sprintf(spos, "Scale: %s%s %s", &tvec[0], t->con.text, t->proptext);
break;
case 1:
sprintf(str, "Scale: %s : %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
spos += sprintf(spos, "Scale: %s : %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
break;
case 2:
sprintf(str, "Scale: %s : %s : %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
spos += sprintf(spos, "Scale: %s : %s : %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
}
}
else {
if (t->flag & T_2D_EDIT)
sprintf(str, "Scale X: %s Y: %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
spos += sprintf(spos, "Scale X: %s Y: %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
else
sprintf(str, "Scale X: %s Y: %s Z: %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
spos += sprintf(spos, "Scale X: %s Y: %s Z: %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
}
if (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED))
sprintf(str, "%s Proportional size: %.2f", str, t->prop_size);
if (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED)) {
spos += sprintf(spos, " Proportional size: %.2f", t->prop_size);
}
(void)spos;
}
#define SIGN(a) (a<-FLT_EPSILON?1:a>FLT_EPSILON?2:3)