Skip to content

Commit 45f2246

Browse files
authored
[Kernel][Object] Remove object name assertions, use rt_strncpy for safe truncation #10943
1 parent 75f1d8d commit 45f2246

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/object.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,9 @@ void rt_object_init(struct rt_object *object,
399399
if(obj_name_len > RT_NAME_MAX - 1)
400400
{
401401
LOG_E("Object name %s exceeds RT_NAME_MAX=%d, consider increasing RT_NAME_MAX.", name, RT_NAME_MAX);
402-
RT_ASSERT(obj_name_len <= RT_NAME_MAX - 1);
403402
}
404-
rt_memcpy(object->name, name, obj_name_len);
405-
object->name[obj_name_len] = '\0';
403+
rt_strncpy(object->name, name, RT_NAME_MAX - 1);
404+
object->name[RT_NAME_MAX - 1] = '\0';
406405
}
407406
else
408407
{
@@ -515,10 +514,9 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
515514
if(obj_name_len > RT_NAME_MAX - 1)
516515
{
517516
LOG_E("Object name %s exceeds RT_NAME_MAX=%d, consider increasing RT_NAME_MAX.", name, RT_NAME_MAX);
518-
RT_ASSERT(obj_name_len <= RT_NAME_MAX - 1);
519517
}
520-
rt_memcpy(object->name, name, obj_name_len);
521-
object->name[obj_name_len] = '\0';
518+
rt_strncpy(object->name, name, RT_NAME_MAX - 1);
519+
object->name[RT_NAME_MAX - 1] = '\0';
522520
}
523521
else
524522
{

0 commit comments

Comments
 (0)