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

netutils/ftpc/ftpc_listdir.c: fix hardfault when issuing 'ls' before 'login'

Browse Source 
Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
This commit is contained in:
Juha Niskanen 2020-12-13 17:26:10 +02:00 committed by Xiang Xiao
parent db0b595b4b
commit 8f0e872384
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netutils/ftpc/ftpc_listdir.c
View File

@ -282,9 +282,21 @@ FAR struct ftpc_dirlist_s *ftpc_listdir(SESSION handle,
int allocsize; int allocsize;
int ret; int ret;
/* If no remote current directory, we are not logged in. */
if (!session->currdir)
{
return NULL;
}
/* Get the absolute path to the directory */ /* Get the absolute path to the directory */
absrpath = ftpc_absrpath(session, dirpath); absrpath = ftpc_absrpath(session, dirpath);
if (!absrpath)
{
return NULL;
}
ftpc_stripslash(absrpath); ftpc_stripslash(absrpath);
/* Is the directory also the remote current working directory? */ /* Is the directory also the remote current working directory? */
@ -293,7 +305,13 @@ FAR struct ftpc_dirlist_s *ftpc_listdir(SESSION handle,
/* Create a temporary file to hold the directory listing */ /* Create a temporary file to hold the directory listing */
asprintf(&tmpfname, "%s/TMP%d.dat", CONFIG_FTP_TMPDIR, getpid()); ret = asprintf(&tmpfname, "%s/TMP%d.dat", CONFIG_FTP_TMPDIR, getpid());
if (ret < 0)
{
free(absrpath);
return NULL;
}
filestream = fopen(tmpfname, "w+"); filestream = fopen(tmpfname, "w+");
if (!filestream) if (!filestream)
{ {