[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53053] trunk/blender/source/blender: replace strcpy with BLI_strncpy or memcpy when the size is known.
Campbell Barton
ideasman42 at gmail.com
Sun Dec 16 09:43:10 CET 2012
Revision: 53053
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53053
Author: campbellbarton
Date: 2012-12-16 08:43:05 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
replace strcpy with BLI_strncpy or memcpy when the size is known.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_property.h
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/gpencil.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/property.c
trunk/blender/source/blender/editors/mask/mask_relationships.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/makesdna/DNA_customdata_types.h
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/blenkernel/BKE_property.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_property.h 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/BKE_property.h 2012-12-16 08:43:05 UTC (rev 53053)
@@ -47,6 +47,7 @@
// int BKE_bproperty_cmp(struct bProperty *prop, const char *str);
void BKE_bproperty_set(struct bProperty *prop, const char *str);
void BKE_bproperty_add(struct bProperty *prop, const char *str);
-void BKE_bproperty_set_valstr(struct bProperty *prop, char *str);
+/* should really be called '_get_valstr()' or '_as_string()' */
+void BKE_bproperty_set_valstr(struct bProperty *prop, char str[MAX_PROPSTRING]);
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -2104,7 +2104,7 @@
if (layer_index < 0) return 0;
if (!name) return 0;
- strcpy(data->layers[layer_index].name, name);
+ BLI_strncpy(data->layers[layer_index].name, name, sizeof(data->layers[layer_index].name));
return 1;
}
@@ -2854,10 +2854,11 @@
* deleted, so assign the active layer to name
*/
index = CustomData_get_active_layer_index(data, type);
- strcpy(outname, data->layers[index].name);
+ BLI_strncpy(outname, data->layers[index].name, MAX_CUSTOMDATA_LAYER_NAME);
}
- else
- strcpy(outname, name);
+ else {
+ BLI_strncpy(outname, name, MAX_CUSTOMDATA_LAYER_NAME);
+ }
}
int CustomData_verify_versions(struct CustomData *data, int index)
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -397,7 +397,7 @@
}
else {
strcpy(surface->output_name, "dp_");
- strcpy(surface->output_name2, surface->output_name);
+ BLI_strncpy(surface->output_name2, surface->output_name, sizeof(surface->output_name2));
surface->flags &= ~MOD_DPAINT_ANTIALIAS;
surface->depth_clamp = 0.0f;
}
Modified: trunk/blender/source/blender/blenkernel/intern/gpencil.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/gpencil.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/intern/gpencil.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -183,7 +183,7 @@
gpl->thickness = 3;
/* auto-name */
- strcpy(gpl->info, name);
+ BLI_strncpy(gpl->info, name, sizeof(gpl->info));
BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info), sizeof(gpl->info));
/* make this one the active one */
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -1855,7 +1855,7 @@
mat_new = BKE_material_copy(ma);
if (mat_new) {
/* rename the material*/
- strcpy(mat_new->id.name, idname);
+ BLI_strncpy(mat_new->id.name, idname, sizeof(mat_new->id.name));
id_us_min((ID *)mat_new);
mat_nr = mesh_addmaterial(me, mat_new);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -57,6 +57,7 @@
#include "DNA_view3d_types.h"
#include "DNA_world_types.h"
#include "DNA_object_types.h"
+#include "DNA_property_types.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
Modified: trunk/blender/source/blender/blenkernel/intern/property.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/property.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/blenkernel/intern/property.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -287,7 +287,7 @@
}
/* reads value of property, sets it in chars in str */
-void BKE_bproperty_set_valstr(bProperty *prop, char *str)
+void BKE_bproperty_set_valstr(bProperty *prop, char str[MAX_PROPSTRING])
{
// extern int Gdfra; /* sector.c */
Modified: trunk/blender/source/blender/editors/mask/mask_relationships.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_relationships.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/editors/mask/mask_relationships.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -31,6 +31,7 @@
#include "BLI_math.h"
+#include "BLI_string.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
@@ -143,8 +144,8 @@
if (MASKPOINT_ISSEL_ANY(point)) {
point->parent.id_type = ID_MC;
point->parent.id = &clip->id;
- strcpy(point->parent.parent, tracking_object->name);
- strcpy(point->parent.sub_parent, track->name);
+ BLI_strncpy(point->parent.parent, tracking_object->name, sizeof(point->parent.parent));
+ BLI_strncpy(point->parent.sub_parent, track->name, sizeof(point->parent.sub_parent));
copy_v2_v2(point->parent.parent_orig, parmask_pos);
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -38,6 +38,7 @@
#include "DNA_screen_types.h"
#include "DNA_smoke_types.h"
#include "DNA_view3d_types.h"
+#include "DNA_property_types.h"
#include "BLI_utildefines.h"
#include "BLI_blenlib.h"
Modified: trunk/blender/source/blender/editors/transform/transform_orientations.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_orientations.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/editors/transform/transform_orientations.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -437,7 +437,7 @@
return count;
}
-void applyTransformOrientation(const bContext *C, float mat[3][3], char *name)
+void applyTransformOrientation(const bContext *C, float mat[3][3], char name[MAX_NAME])
{
TransformOrientation *ts;
View3D *v3d = CTX_wm_view3d(C);
@@ -448,8 +448,9 @@
for (i = 0, ts = CTX_data_scene(C)->transform_spaces.first; ts; ts = ts->next, i++) {
if (selected_index == i) {
- if (name)
- strcpy(name, ts->name);
+ if (name) {
+ BLI_strncpy(name, ts->name, MAX_NAME);
+ }
copy_m3_m3(mat, ts->mat);
break;
Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_customdata_types.h 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h 2012-12-16 08:43:05 UTC (rev 53053)
@@ -46,7 +46,7 @@
int active_clone; /* number of the layer to render*/
int active_mask; /* number of the layer to render*/
int uid; /* shape keyblock unique id reference*/
- char name[64]; /* layer name, MAX_CUSTOMDATA_LAYER_AAME */
+ char name[64]; /* layer name, MAX_CUSTOMDATA_LAYER_NAME */
void *data; /* layer data */
} CustomDataLayer;
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2012-12-16 06:30:17 UTC (rev 53052)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2012-12-16 08:43:05 UTC (rev 53053)
@@ -775,7 +775,7 @@
static void rna_ConsoleLine_body_get(PointerRNA *ptr, char *value)
{
ConsoleLine *ci = (ConsoleLine *)ptr->data;
- strcpy(value, ci->line);
+ memcpy(value, ci->line, ci->len + 1);
}
static int rna_ConsoleLine_body_length(PointerRNA *ptr)
More information about the Bf-blender-cvs
mailing list