summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/object.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/object.c b/src/object.c
index 1d5a211208..507a47894e 100644
--- a/src/object.c
+++ b/src/object.c
@@ -399,10 +399,9 @@ void rt_object_init(struct rt_object *object,
if(obj_name_len > RT_NAME_MAX - 1)
{
LOG_E("Object name %s exceeds RT_NAME_MAX=%d, consider increasing RT_NAME_MAX.", name, RT_NAME_MAX);
- RT_ASSERT(obj_name_len <= RT_NAME_MAX - 1);
}
- rt_memcpy(object->name, name, obj_name_len);
- object->name[obj_name_len] = '\0';
+ rt_strncpy(object->name, name, RT_NAME_MAX - 1);
+ object->name[RT_NAME_MAX - 1] = '\0';
}
else
{
@@ -515,10 +514,9 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
if(obj_name_len > RT_NAME_MAX - 1)
{
LOG_E("Object name %s exceeds RT_NAME_MAX=%d, consider increasing RT_NAME_MAX.", name, RT_NAME_MAX);
- RT_ASSERT(obj_name_len <= RT_NAME_MAX - 1);
}
- rt_memcpy(object->name, name, obj_name_len);
- object->name[obj_name_len] = '\0';
+ rt_strncpy(object->name, name, RT_NAME_MAX - 1);
+ object->name[RT_NAME_MAX - 1] = '\0';
}
else
{