luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libc/modlib: guard modname field usage

Browse source 
This guards `.modname` field usage with same condition as header
definitions.

Signed-off-by: Yanfeng Liu <p-liuyanfeng9@xiaomi.com>
This commit is contained in:
Yanfeng Liu 2025-01-22 14:07:34 +08:00 • committed by Xiang Xiao
parent ada75b0b93
commit 944f6ceeec
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/libc/modlib/modlib_insert.c
View file

@ -115,7 +115,9 @@ void modlib_dumploadinfo(FAR struct mod_loadinfo_s *loadinfo)
void modlib_dumpmodule(FAR struct module_s *modp) void modlib_dumpmodule(FAR struct module_s *modp)
{ {
binfo("Module:\n"); binfo("Module:\n");
#ifdef HAVE_MODLIB_NAMES
binfo(" modname: %s\n", modp->modname); binfo(" modname: %s\n", modp->modname);
#endif
binfo(" textalloc: %08lx\n", (long)modp->textalloc); binfo(" textalloc: %08lx\n", (long)modp->textalloc);
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE) #if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
binfo(" dataalloc: %08lx\n", (long)modp->dataalloc); binfo(" dataalloc: %08lx\n", (long)modp->dataalloc);
@ -136,7 +138,11 @@ void modlib_dumpmodule(FAR struct module_s *modp)
binfo(" dependents: %d\n", modp->dependents); binfo(" dependents: %d\n", modp->dependents);
for (int i = 0; i < modp->dependents; i++) for (int i = 0; i < modp->dependents; i++)
{ {
# ifdef HAVE_MODLIB_NAMES
binfo("%d %s\n", i, modp->dependencies[i]->modname); binfo("%d %s\n", i, modp->dependencies[i]->modname);
# else
binfo("%d\n", i);
# endif
modlib_dumpmodule(modp->dependencies[i]); modlib_dumpmodule(modp->dependencies[i]);
} }
#endif #endif