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

ftpd: Avoid NULL pointer checks before free()

Browse Source 
They are superfluous and just bloat the code.

Update #3530.
This commit is contained in:
Sebastian Huber
2018-10-05 14:05:22 +02:00
parent 05b5f9c0ea
commit e761fb4dc0
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cpukit/ftpd/ftpd.c
View File

@@ -373,10 +373,8 @@ task_pool_done(int count)
int i; int i;
for(i = 0; i < count; ++i) for(i = 0; i < count; ++i)
rtems_task_delete(task_pool.info[i].tid); rtems_task_delete(task_pool.info[i].tid);
if(task_pool.info) free(task_pool.info);
free(task_pool.info); free(task_pool.queue);
if(task_pool.queue)
free(task_pool.queue);
rtems_mutex_destroy(&task_pool.mutex); rtems_mutex_destroy(&task_pool.mutex);
rtems_counting_semaphore_destroy(&task_pool.sem); rtems_counting_semaphore_destroy(&task_pool.sem);
task_pool.info = 0; task_pool.info = 0;
@@ -1740,10 +1738,8 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
else if (!strcmp("USER", cmd)) else if (!strcmp("USER", cmd))
{ {
sscanf(args, "%254s", fname); sscanf(args, "%254s", fname);
if (info->user) free(info->user);
free(info->user); free(info->pass);
if (info->pass)
free(info->pass);
info->pass = NULL; info->pass = NULL;
info->user = strdup(fname); info->user = strdup(fname);
if (ftpd_config->login && if (ftpd_config->login &&
@@ -1758,8 +1754,7 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
else if (!strcmp("PASS", cmd)) else if (!strcmp("PASS", cmd))
{ {
sscanf(args, "%254s", fname); sscanf(args, "%254s", fname);
if (info->pass) free(info->pass);
free(info->pass);
info->pass = strdup(fname); info->pass = strdup(fname);
if (!info->user) { if (!info->user) {
send_reply(info, 332, "Need account to log in"); send_reply(info, 332, "Need account to log in");