summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-03-10 13:04:25 +0800
committerGitHub <[email protected]>2019-03-10 13:04:25 +0800
commit6a12704bc6a5ca96a18c15bb6cea0787b8d81e12 (patch)
tree43ed5527841760339e3883d393ec44c376a957b8 /components
parent1cf890c1bf73558ff9b129fa64d4e11689e1bef7 (diff)
parent584593071eac32ea7e65eedd81a36a1326bbbfe1 (diff)
Merge pull request #2412 from armink/fix_ulog
Update the ulog
Diffstat (limited to 'components')
-rw-r--r--components/utilities/ulog/ulog.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/components/utilities/ulog/ulog.c b/components/utilities/ulog/ulog.c
index b813678ecd..87d0932506 100644
--- a/components/utilities/ulog/ulog.c
+++ b/components/utilities/ulog/ulog.c
@@ -315,7 +315,10 @@ RT_WEAK rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *ta
/* is not in interrupt context */
if (rt_interrupt_get_nest() == 0)
{
- log_len += ulog_strcpy(log_len, log_buf + log_len, rt_thread_self()->name);
+ rt_size_t name_len = rt_strnlen(rt_thread_self()->name, RT_NAME_MAX);
+
+ rt_strncpy(log_buf + log_len, rt_thread_self()->name, name_len);
+ log_len += name_len;
}
else
{