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

!668 修复fatfs中GetLdPath无法正常返回结果 

Merge pull request !668 from xiexg-dc/riscv32-virt
This commit is contained in:
openharmony_ci 2022-04-11 06:18:21 +00:00 committed by Gitee
parent a77aa7de98 46546688c9
commit 56565beeb6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/fs/fatfs/fatfs.c
View File

@ -236,6 +236,7 @@ static int FatfsErrno(int result)
char * GetLdPath(const char *source) char * GetLdPath(const char *source)
{ {
#define LDPATH_PAD 2 // 2 means: strlen("/") + len of '\0'
int ret; int ret;
int partId = GetPartIdByPartName(source); int partId = GetPartIdByPartName(source);
if ((partId < 0) || (partId >= MAX_PARTITION_NUM)) { if ((partId < 0) || (partId >= MAX_PARTITION_NUM)) {
@ -243,16 +244,16 @@ char * GetLdPath(const char *source)
} }
char *volPath = g_volPath[partId]; char *volPath = g_volPath[partId];
char *ldPath = (char *)malloc(strlen(volPath) + 1); char *ldPath = (char *)malloc(strlen(volPath) + LDPATH_PAD);
if (ldPath == NULL) { if (ldPath == NULL) {
return NULL; return NULL;
} }
(void)memset_s(ldPath, strlen(volPath) + 1, 0, strlen(volPath) + 1); (void)memset_s(ldPath, strlen(volPath) + LDPATH_PAD, 0, strlen(volPath) + LDPATH_PAD);
/* Convert volPath to ldpath, for example, convert "inner" to "/inner" */ /* Convert volPath to ldpath, for example, convert "inner" to "/inner" */
*ldPath = '/'; *ldPath = '/';
ret = strcpy_s(ldPath + 1, strlen(volPath), volPath); ret = strcpy_s(ldPath + 1, strlen(volPath)+1, volPath);
if (ret != EOK) { if (ret != EOK) {
free(ldPath); free(ldPath);
return NULL; return NULL;