appended null termination to version string

adding closure of socket in syslog_thread and read_socket

fixed missing free of filepath in compressed file transfer

fixed missing closedir in added in send_one error case

fixed missing fclose of src_file in ferror case

dlt-daemon.c fixed missing fclose in ferror case

dlt_common.c using snprintf for filename instead sprintf in dlt_file_open

modified some magix numbers - replaced by limits.h values. added strncpy instead strcpy to make cp more safe. split up a function to avoid coverity complaint when computing size of a write buffer length

dlt_daemon_common: added strncpy instead strcpy to make cp more safe.

Fixes some more Coverity issues in dlt-daemon.c dlt_user.c dlt_common.c and dlt_offline_trace.c.

Conflicts:

	src/daemon/dlt-daemon.c
	src/lib/dlt_user.c

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h
index b3dfbc6..8f5a36f 100644
--- a/src/daemon/dlt_daemon_common.h
+++ b/src/daemon/dlt_daemon_common.h
@@ -73,6 +73,7 @@
   \{

 */

 

+#include <limits.h>

 #include <semaphore.h>

 #include "dlt_common.h"

 #include "dlt_user.h"

@@ -137,9 +138,9 @@ typedef struct
 	int sendserialheader;          /**< 1: send serial header; 0 don't send serial header */

 	int timingpackets;              /**< 1: send continous timing packets; 0 don't send continous timing packets */

 	DltBuffer client_ringbuffer; /**< Ring-buffer for storing received logs while no client connection is available */

-	char runtime_application_cfg[256]; /**< Path and filename of persistent application configuration */

-	char runtime_context_cfg[256]; /**< Path and filename of persistent context configuration */

-	char runtime_configuration[256]; /**< Path and filename of persistent configuration */

+        char runtime_application_cfg[PATH_MAX + 1]; /**< Path and filename of persistent application configuration. Set to path max, as it specifies a full path*/

+        char runtime_context_cfg[PATH_MAX + 1]; /**< Path and filename of persistent context configuration */

+        char runtime_configuration[PATH_MAX + 1]; /**< Path and filename of persistent configuration */

     DltUserLogMode mode;	/**< Mode used for tracing: off, external, internal, both */

     char state;				/**< state for tracing: 0 = no client connected, 1 = client connected */

 } DltDaemon;