yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复3.1代码检视中的问题 

【背景】
3.1 代码检视中有一些问题需要修改

【修改方案】
在可能内存泄露的地方进行了修改,在安全函数前加void转换

【影响】
对现有的产品编译不会有影响。

Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: I8a37ecf7c8d81d24ebe153d0c0a7db008cc3e4b9
This commit is contained in:
yinjiaming 2022-03-18 07:11:12 +00:00
parent a42ba7aed6
commit e7e850a6a6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/dynlink/los_dynlink.c
View File

@ -796,13 +796,13 @@ VOID *LOS_SoLoad(const CHAR *fileName, VOID *pool)
return dso; return dso;
ERR2: ERR2:
LOS_MemFree(dso->pool, (VOID *)dso->loadBase); (VOID)LOS_MemFree(dso->pool, (VOID *)dso->loadBase);
ERR1: ERR1:
close(dso->fd); close(dso->fd);
(VOID)LOS_MuxPost(g_dynlinkMux); (VOID)LOS_MuxPost(g_dynlinkMux);
LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo->elfPhdr); (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo->elfPhdr);
LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo); (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo);
LOS_MemFree(OS_SYS_MEM_ADDR, dso); (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dso);
return NULL; return NULL;
} }
@ -902,9 +902,12 @@ INT32 LOS_SoUnload(VOID *handle)
LOS_ListDelete(&dso->dsoNode); LOS_ListDelete(&dso->dsoNode);
(VOID)LOS_MuxPost(g_dynlinkMux); (VOID)LOS_MuxPost(g_dynlinkMux);
LOS_MemFree(dso->pool, (VOID *)dso->loadBase); (VOID)LOS_MemFree(dso->pool, (VOID *)dso->loadBase);
LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo); if (dso->dlInfo != NULL) {
LOS_MemFree(OS_SYS_MEM_ADDR, dso); (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo->elfPhdr);
}
(VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dso->dlInfo);
(VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dso);
return LOS_OK; return LOS_OK;
ERR: ERR:

1
components/shell/src/cmds/vfs_shellcmd.c
View File

@ -209,6 +209,7 @@ VOID OsLs(const CHAR *pathname)
} }
} while (pdirent != NULL); } while (pdirent != NULL);
free(path);
(VOID)closedir(d); (VOID)closedir(d);
} }
} }