Revision: 40224
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40224
Author: campbellbarton
Date: 2011-09-15 12:26:48 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid.
also replace strcpy's which copy using "" with str[0]='\0'
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_property.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_text.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -942,7 +942,7 @@
sprintf(buf, "sequence_editor.sequences_all[\"%s\"]",
seq->name+2);
}
else
- strcpy(buf, ""); /* empty string */
+ buf[0]= '\0'; /* empty string */
BLI_dynstr_append(path, buf);
/* need to add dot before property if there was anything precceding
this */
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -418,7 +418,7 @@
for (ct= targets.first; ct; ct=
ct->next) {
if (ct->tar == ob) {
ct->tar = NULL;
-
strcpy(ct->subtarget, "");
+
ct->subtarget[0]= '\0';
obt->recalc |=
OB_RECALC_DATA;
}
}
@@ -448,7 +448,7 @@
for (ct= targets.first; ct; ct= ct->next) {
if (ct->tar == ob) {
ct->tar = NULL;
- strcpy(ct->subtarget, "");
+ ct->subtarget[0]= '\0';
obt->recalc |= OB_RECALC_DATA;
}
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -9232,7 +9232,7 @@
simasel->prv_w = 96;
simasel->flag = 7; /*
??? elubie */
strcpy (simasel->dir,
U.textudir); /* TON */
- strcpy (simasel->file,
"");
+ simasel->file[0]= '\0';
simasel->returnfunc
= NULL;
simasel->title[0]
= 0;
@@ -9462,7 +9462,7 @@
/* clear old
targets to avoid problems */
data->tar =
NULL;
-
strcpy(data->subtarget, "");
+
data->subtarget[0]= '\0';
}
}
else if (con->type ==
CONSTRAINT_TYPE_LOCLIKE) {
@@ -9492,7 +9492,7 @@
/* clear old targets to avoid
problems */
data->tar = NULL;
- strcpy(data->subtarget, "");
+ data->subtarget[0]= '\0';
}
}
else if (con->type == CONSTRAINT_TYPE_LOCLIKE) {
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -1439,9 +1439,7 @@
pld->pose->flag &= ~POSE_DO_UNLOCK;
/* clear strings + search */
- strcpy(pld->headerstr, "");
- strcpy(pld->searchstr, "");
- strcpy(pld->searchold, "");
+ pld->headerstr[0]= pld->searchstr[0]= pld->searchold[0]= '\0';
pld->search_cursor= 0;
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
2011-09-15 12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
2011-09-15 12:26:48 UTC (rev 40224)
@@ -765,7 +765,7 @@
}
else {
/* pop up panel - no previous, or user didn't want search after
previous */
- strcpy(name, "");
+ name[0]= '\0';
// XXX if (sbutton(name, 0, sizeof(name)-1, "Find: ") && name[0]) {
// te= outliner_find_named(soops, &soops->tree, name,
flags, NULL, &prevFound);
// }
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/editors/transform/transform.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -3371,10 +3371,10 @@
if(chainlen)
sprintf(autoik, "AutoIK-Len: %d", chainlen);
else
- strcpy(autoik, "");
+ autoik[0]= '\0';
}
else
- strcpy(autoik, "");
+ autoik[0]= '\0';
if (t->con.mode & CON_APPLY) {
switch(t->num.idx_max) {
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2011-09-15 12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2011-09-15 12:26:48 UTC (rev 40224)
@@ -1666,13 +1666,13 @@
strcpy(t->proptext, "(Random)");
break;
default:
- strcpy(t->proptext, "");
+ t->proptext[0]= '\0';
}
}
else {
for(i = 0 ; i < t->total; i++, td++) {
td->factor = 1.0;
}
- strcpy(t->proptext, "");
+ t->proptext[0]= '\0';
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_action.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_action.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -137,7 +137,7 @@
TimeMarker *marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
marker->flag= 1;
marker->frame= 1;
- BLI_strncpy(marker->name, name, sizeof(marker->name));
+ BLI_strncpy_utf8(marker->name, name, sizeof(marker->name));
BLI_addtail(&act->markers, marker);
return marker;
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c
2011-09-15 12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c
2011-09-15 12:26:48 UTC (rev 40224)
@@ -252,7 +252,7 @@
if (ksp->rna_path)
strcpy(value, ksp->rna_path);
else
- strcpy(value, "");
+ value[0]= '\0';
}
static int rna_ksPath_RnaPath_length(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -253,7 +253,7 @@
char oldname[sizeof(ebone->name)], newname[sizeof(ebone->name)];
/* need to be on the stack */
- BLI_strncpy(newname, value, sizeof(ebone->name));
+ BLI_strncpy_utf8(newname, value, sizeof(ebone->name));
BLI_strncpy(oldname, ebone->name, sizeof(ebone->name));
ED_armature_bone_rename(arm, oldname, newname);
@@ -266,7 +266,7 @@
char oldname[sizeof(bone->name)], newname[sizeof(bone->name)];
/* need to be on the stack */
- BLI_strncpy(newname, value, sizeof(bone->name));
+ BLI_strncpy_utf8(newname, value, sizeof(bone->name));
BLI_strncpy(oldname, bone->name, sizeof(bone->name));
ED_armature_bone_rename(arm, oldname, newname);
Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_constraint.c
2011-09-15 12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c
2011-09-15 12:26:48 UTC (rev 40224)
@@ -170,7 +170,7 @@
BLI_strncpy(oldname, con->name, sizeof(con->name));
/* copy the new name into the name slot */
- BLI_strncpy(con->name, value, sizeof(con->name));
+ BLI_strncpy_utf8(con->name, value, sizeof(con->name));
/* make sure name is unique */
if (ptr->id.data) {
Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -215,7 +215,7 @@
if (dtar->rna_path)
strcpy(value, dtar->rna_path);
else
- strcpy(value, "");
+ value[0]= '\0';
}
static int rna_DriverTarget_RnaPath_length(PointerRNA *ptr)
@@ -309,7 +309,7 @@
if (fcu->rna_path)
strcpy(value, fcu->rna_path);
else
- strcpy(value, "");
+ value[0]= '\0';
}
static int rna_FCurve_RnaPath_length(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_key.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_key.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -76,7 +76,7 @@
BLI_strncpy(oldname, kb->name, sizeof(kb->name));
/* copy the new name into the name slot */
- BLI_strncpy(kb->name, value, sizeof(kb->name));
+ BLI_strncpy_utf8(kb->name, value, sizeof(kb->name));
/* make sure the name is truly unique */
if (ptr->id.data) {
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2011-09-15
12:07:53 UTC (rev 40223)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2011-09-15
12:26:48 UTC (rev 40224)
@@ -690,7 +690,7 @@
Mesh *me= (Mesh*)ptr->id.data;
CustomData *fdata= rna_mesh_fdata(me);
CustomDataLayer *cdl= (CustomDataLayer*)ptr->data;
- BLI_strncpy(cdl->name, value, sizeof(cdl->name));
+ BLI_strncpy_utf8(cdl->name, value, sizeof(cdl->name));
CustomData_set_layer_unique_name(fdata, cdl - fdata->layers);
}
@@ -802,7 +802,7 @@
Mesh *me= (Mesh*)ptr->id.data;
CustomData *fdata= rna_mesh_fdata(me);
CustomDataLayer *cdl= (CustomDataLayer*)ptr->data;
- BLI_strncpy(cdl->name, value, sizeof(cdl->name));
+ BLI_strncpy_utf8(cdl->name, value, sizeof(cdl->name));
CustomData_set_layer_unique_name(fdata, cdl - fdata->layers);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-09-15
12:07:53 UTC (rev 40223)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
