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, 5 insertions, 4 deletions

diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c
index 206fa51..72b31ad 100644
--- a/src/shared/dlt_offline_trace.c
+++ b/src/shared/dlt_offline_trace.c
@@ -170,7 +170,7 @@ int dlt_offline_trace_check_size(DltOfflineTrace *trace) {
 int dlt_offline_trace_init(DltOfflineTrace *trace,const char *directory,int fileSize,int maxSize) {
 
 	/* init parameters */
-	strcpy(trace->directory,directory);
+        strncpy(trace->directory,directory,NAME_MAX);
 	trace->fileSize = fileSize;
 	trace->maxSize = maxSize;
 
@@ -190,6 +190,7 @@ int dlt_offline_trace_write(DltOfflineTrace *trace,unsigned char *data1,int size
 	{
 		/* close old file */
 		close(trace->ohandle);
+                trace->ohandle = -1;
 		
 		/* check complete offline trace size, remove old logs if needed */
 		dlt_offline_trace_check_size(trace);
@@ -199,19 +200,19 @@ int dlt_offline_trace_write(DltOfflineTrace *trace,unsigned char *data1,int size
 	}
 	
 	/* write data into log file */
-	if(data1) {
+        if(data1 && (trace->ohandle >= 0)) {
 		if(write(trace->ohandle,data1,size1)!=size1) {
 			printf("Offline trace write failed!\n");
 			return -1;			
 		}
 	}
-	if(data2) {
+        if(data2 && (trace->ohandle >= 0)) {
 		if(write(trace->ohandle,data2,size2)!=size2) {
 			printf("Offline trace write failed!\n");
 			return -1;						
 		}
 	}
-	if(data3) {
+        if(data3 && (trace->ohandle >= 0)) {
 		if(write(trace->ohandle,data3,size3)!=size3) {
 			printf("Offline trace write failed!\n");
 			return -1;