libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #69 from geniusgogo/dfs-fixbug

Browse Source 
dfs.c: fix null pointer bug.
This commit is contained in:
prife 2013-03-31 11:36:47 -07:00
commit 96c9aea120
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/dfs/src/dfs.c
View File

@ -304,6 +304,9 @@ char *dfs_normalize_path(const char *directory, const char *filename)
{ {
fullpath = rt_malloc(strlen(directory) + strlen(filename) + 2); fullpath = rt_malloc(strlen(directory) + strlen(filename) + 2);
if (fullpath == RT_NULL)
return RT_NULL;
/* join path and file name */ /* join path and file name */
rt_snprintf(fullpath, strlen(directory) + strlen(filename) + 2, rt_snprintf(fullpath, strlen(directory) + strlen(filename) + 2,
"%s/%s", directory, filename); "%s/%s", directory, filename);
@ -311,6 +314,9 @@ char *dfs_normalize_path(const char *directory, const char *filename)
else else
{ {
fullpath = rt_strdup(filename); /* copy string */ fullpath = rt_strdup(filename); /* copy string */
if (fullpath == RT_NULL)
return RT_NULL;
} }
src = fullpath; src = fullpath;