RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

tftpfs: Some bug fixes

Browse Source 
Fix for:

- tftpfs did not mount, when device field in mount entry is empty

- tftpfs needs to allocate fs structure before it fills it (avoid use of
  uninitialized pointer)

- tftpfs needs to skip initial slash before hostname
This commit is contained in:
Thomas Dörfler
2018-12-20 14:26:50 +01:00
committed by Sebastian Huber
parent 8af51b09e2
commit 10135fab5d
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -186,21 +186,28 @@ int rtems_tftpfs_initialize(
{
const char *device = mt_entry->dev;
size_t devicelen = strlen (device);
tftpfs_info_t *fs;
tftpfs_info_t *fs = NULL;
char *root_path;
if (devicelen == 0)
rtems_set_errno_and_return_minus_one (ENXIO);
fs = malloc (sizeof (*fs));
root_path = malloc (devicelen + 2);
if (root_path == NULL || fs == NULL)
if (devicelen == 0) {
root_path = malloc (1);
if (root_path == NULL)
goto error;
root_path [0] = '\0';
}
else {
root_path = malloc (devicelen + 2);
if (root_path == NULL)
goto error;
root_path = memcpy (root_path, device, devicelen);
root_path [devicelen] = '/';
root_path [devicelen + 1] = '\0';
root_path = memcpy (root_path, device, devicelen);
root_path [devicelen] = '/';
root_path [devicelen + 1] = '\0';
}
fs = malloc (sizeof (*fs));
if (fs == NULL)
goto error;
fs->flags = 0;
fs->nStreams = 0;
fs->tftpStreams = 0;
@@ -538,6 +545,9 @@ static int rtems_tftp_open_worker(
/*
* Extract the host name component
*/
if (*full_path_name == '/')
full_path_name++;
hostname = full_path_name;
cp1 = strchr (full_path_name, ':');
if (!cp1) {