sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm: Terminate the backtrace array with one NULL pointer

Browse Source 
since one entry is enough to identify the end of back trace

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-11-24 19:36:21 +08:00 committed by Xiang Xiao
parent 29404ef54e
commit 154bb93c45
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/mempool/mempool.c
View File

@ -111,9 +111,9 @@ static inline void mempool_add_backtrace(FAR struct mempool_s *pool,
if (pool->procfs.backtrace) if (pool->procfs.backtrace)
{ {
int result = backtrace(buf->backtrace, CONFIG_MM_BACKTRACE); int result = backtrace(buf->backtrace, CONFIG_MM_BACKTRACE);
while (result < CONFIG_MM_BACKTRACE) if (result < CONFIG_MM_BACKTRACE)
{ {
buf->backtrace[result++] = NULL; buf->backtrace[result] = NULL;
} }
} }
else else

6
mm/mm_heap/mm.h
View File

@ -89,14 +89,14 @@
if ((heap)->mm_procfs.backtrace || (tcb && tcb->flags & TCB_FLAG_HEAP_DUMP)) \ if ((heap)->mm_procfs.backtrace || (tcb && tcb->flags & TCB_FLAG_HEAP_DUMP)) \
{ \ { \
int n = backtrace(tmp->backtrace, CONFIG_MM_BACKTRACE); \ int n = backtrace(tmp->backtrace, CONFIG_MM_BACKTRACE); \
while (n < CONFIG_MM_BACKTRACE) \ if (n < CONFIG_MM_BACKTRACE) \
{ \ { \
tmp->backtrace[n++] = NULL; \ tmp->backtrace[n] = NULL; \
} \ } \
} \ } \
else \ else \
{ \ { \
tmp->backtrace[0] = 0; \ tmp->backtrace[0] = NULL; \
} \ } \
} \ } \
while (0) while (0)

4
mm/tlsf/mm_tlsf.c
View File

@ -156,9 +156,9 @@ static void memdump_backtrace(FAR struct mm_heap_s *heap,
(tcb && tcb->flags & TCB_FLAG_HEAPDUMP)) (tcb && tcb->flags & TCB_FLAG_HEAPDUMP))
{ {
int ret = backtrace(dump->backtrace, CONFIG_MM_BACKTRACE); int ret = backtrace(dump->backtrace, CONFIG_MM_BACKTRACE);
while (ret < CONFIG_MM_BACKTRACE) if (ret < CONFIG_MM_BACKTRACE)
{ {
dump->backtrace[ret++] = NULL; dump->backtrace[ret] = NULL;
} }
} }
# endif # endif