summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Rusu <andrew_x_2005@yahoo.com>2021-11-12 03:01:45 +0200
committerGitHub <noreply@github.com>2021-11-12 10:01:45 +0900
commit68fb45019d04b637d5a51fbda411599ccf779dad (patch)
tree6f2ddcb96254e15c1a45580591d0a8d70d42aecc
parentac5b12440da75a36fa7d98a32545acf1e696004f (diff)
downloadDLT-daemon-68fb45019d04b637d5a51fbda411599ccf779dad.tar.gz
dlt-system: fix invalid free by removing unused TempDir (#350)
Signed-off-by: Andrei-Mircea Rusu <andrei-mircea.rusu@continental-corporation.com>
-rw-r--r--src/system/dlt-system-options.c11
-rw-r--r--src/system/dlt-system.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/src/system/dlt-system-options.c b/src/system/dlt-system-options.c
index 69024d1..50ff640 100644
--- a/src/system/dlt-system-options.c
+++ b/src/system/dlt-system-options.c
@@ -305,12 +305,6 @@ int read_configuration_file(DltSystemConfiguration *config, char *file_name)
{
config->Filetransfer.TimeoutBetweenLogs = atoi(value);
}
- else if (strcmp(token, "FiletransferTempDir") == 0)
- {
- config->Filetransfer.TempDir = malloc(strlen(value) + 1);
- MALLOC_ASSERT(config->Filetransfer.TempDir);
- strcpy(config->Filetransfer.TempDir, value); /* strcpy unritical here, because size matches exactly the size to be copied */
- }
else if (strcmp(token, "FiletransferDirectory") == 0)
{
config->Filetransfer.Directory[config->Filetransfer.Count] = malloc(strlen(value) + 1);
@@ -432,11 +426,6 @@ void cleanup_config(DltSystemConfiguration *config, DltSystemCliOptions *options
}
/* File transfer */
- if ((config->Filetransfer.TempDir) != NULL)
- {
- free(config->Filetransfer.TempDir);
- config->Filetransfer.TempDir = NULL;
- }
for(int i = 0 ; i < DLT_SYSTEM_LOG_DIRS_MAX ; i++)
{
if ((config->Filetransfer.Directory[i]) != NULL)
diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h
index bbd09fd..bb81723 100644
--- a/src/system/dlt-system.h
+++ b/src/system/dlt-system.h
@@ -134,7 +134,6 @@ typedef struct {
char ContextId[DLT_ID_SIZE];
int TimeStartup;
int TimeoutBetweenLogs;
- char *TempDir;
/* Variable number of file transfer dirs */
int Count;