From 7ef3a634808c1b3c9284d8f8253ca1b4c1d34eb3 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 19 Oct 2020 09:17:41 -0500 Subject: Cleanup: Use BLI string functions It's better not to assume that strings passed as arguments will have the proper size. --- .../intern/MOD_gpencil_ui_common.c | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'source/blender/gpencil_modifiers/intern') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c index be71f4882f6..1985ec5caf5 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c @@ -17,9 +17,8 @@ * \ingroup modifiers */ -#include - #include "BLI_listbase.h" +#include "BLI_string.h" #include "MEM_guardedalloc.h" @@ -373,10 +372,10 @@ PanelType *gpencil_modifier_panel_register(ARegionType *region_type, PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname); - strcpy(panel_type->idname, panel_idname); - strcpy(panel_type->label, ""); - strcpy(panel_type->context, "modifier"); - strcpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + BLI_strncpy(panel_type->idname, panel_idname, BKE_ST_MAXNAME); + BLI_strncpy(panel_type->label, "", BKE_ST_MAXNAME); + BLI_strncpy(panel_type->context, "modifier", BKE_ST_MAXNAME); + BLI_strncpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA, BKE_ST_MAXNAME); panel_type->draw_header = gpencil_modifier_panel_header; panel_type->draw = draw; @@ -409,16 +408,14 @@ PanelType *gpencil_modifier_subpanel_register(ARegionType *region_type, { /* Create the subpanel's ID name. */ char panel_idname[BKE_ST_MAXNAME]; - strcpy(panel_idname, parent->idname); - strcat(panel_idname, "_"); - strcat(panel_idname, name); + BLI_snprintf(panel_idname, BKE_ST_MAXNAME, "%s_%s", parent->idname, name); PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname); - strcpy(panel_type->idname, panel_idname); - strcpy(panel_type->label, label); - strcpy(panel_type->context, "modifier"); - strcpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + BLI_strncpy(panel_type->idname, panel_idname, BKE_ST_MAXNAME); + BLI_strncpy(panel_type->label, label, BKE_ST_MAXNAME); + BLI_strncpy(panel_type->context, "modifier", BKE_ST_MAXNAME); + BLI_strncpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA, BKE_ST_MAXNAME); panel_type->draw_header = draw_header; panel_type->draw = draw; @@ -426,7 +423,7 @@ PanelType *gpencil_modifier_subpanel_register(ARegionType *region_type, panel_type->flag = (PNL_DEFAULT_CLOSED | PNL_DRAW_BOX); BLI_assert(parent != NULL); - strcpy(panel_type->parent_id, parent->idname); + BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME); panel_type->parent = parent; BLI_addtail(&parent->children, BLI_genericNodeN(panel_type)); BLI_addtail(®ion_type->paneltypes, panel_type); -- cgit v1.2.3