From 90c8b5b2890a227088b5a67a21bdc24028b156d5 Mon Sep 17 00:00:00 2001 From: Phong Tran Date: Thu, 29 Mar 2018 13:51:29 +0700 Subject: minor compiler warning gcc 7.x (#30) * Fix -Wpointer-compare of compare with null char Signed-off-by: Phong Tran * dlt_common: fix -Wformat-truncation of snprintf Avoid snprintf output truncation by handling return value Signed-off-by: Phong Tran * dlt_offline_trace: Fix Wformat-truncation of snprintf Compile with Gcc 7.x has the warning of snprintf buffer length size. Check return value of snprintf() for avoiding the warning. Signed-off-by: Phong Tran * dlt_common_test: Fix memleak t_dlt_message_read some resources were not free after using. Detected by running valgrind --leak-check=full ./gtest_dlt_common Signed-off-by: Phong Tran --- src/shared/dlt_offline_trace.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/shared/dlt_offline_trace.c') diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 32b5253..6b7a10a 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -216,6 +216,7 @@ DltReturnValue dlt_offline_trace_create_new_file(DltOfflineTrace *trace) { /* set filename */ if(trace->filenameTimestampBased) { + int ret = 0; t = time(NULL); tmp = localtime(&t); if (NULL == tmp) { @@ -224,16 +225,27 @@ DltReturnValue dlt_offline_trace_create_new_file(DltOfflineTrace *trace) { } if (strftime(outstr, sizeof(outstr),"%Y%m%d_%H%M%S", tmp) == 0) { } - snprintf(trace->filename, NAME_MAX + 1, "%s/dlt_offlinetrace_%s.dlt", trace->directory, outstr); + ret = snprintf(trace->filename, NAME_MAX , "%s/dlt_offlinetrace_%s.dlt", trace->directory, outstr); + if ((ret < 0) || (ret >= NAME_MAX)) + { + printf("dlt_offlinetrace filename cannot be concatenated\n"); + return DLT_RETURN_ERROR; + } } else { + int ret = 0; /* targeting newest file, ignoring number of files in dir returned */ dlt_offline_trace_storage_dir_info(trace->directory, DLT_OFFLINETRACE_FILENAME_BASE, newest, oldest); idx = dlt_offline_trace_get_idx_of_log_file(newest) + 1; dlt_offline_trace_file_name(outstr, DLT_OFFLINETRACE_FILENAME_BASE, idx); - snprintf(trace->filename, NAME_MAX + 1, "%s/%s", trace->directory, outstr); + ret = snprintf(trace->filename, NAME_MAX, "%s/%s", trace->directory, outstr); + if ((ret < 0) || (ret >= NAME_MAX)) + { + printf("filename cannot be concatenated\n"); + return DLT_RETURN_ERROR; + } } -- cgit v1.2.1