summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Brandner <simon.brandner@partner.bmw.de>2012-11-28 14:06:29 +0100
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2013-07-19 16:53:56 +0200
commitcbda448be7f8d64037d1eb82700d809e2bef4389 (patch)
treed3d3ed2790d392d02537d153e804be68a7f96c40 /src
parent1d97f52cbc598e2604eb079f776309d005846c69 (diff)
downloadDLT-daemon-cbda448be7f8d64037d1eb82700d809e2bef4389.tar.gz
Fix: Parasoft DLT complaints about missing Null pointer check
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src')
-rw-r--r--src/lib/dlt_user.c10
-rw-r--r--src/shared/dlt_offline_trace.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 87a7ffd..199b943 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -2675,8 +2675,16 @@ int dlt_user_queue_resend(void)
* This will be freed in dlt_user_trace_network_segmented_thread
* */
s_segmented_data *resend_data = malloc(sizeof(s_segmented_data));
+
+ if (NULL == resend_data)
+ {
+ return -1;
+ }
+
resend_data->payload_len = DLT_DELAYED_RESEND_INDICATOR_PATTERN;
+
+
/* Open queue if it is not open */
if(dlt_init_message_queue() < 0)
{
@@ -3620,7 +3628,7 @@ void dlt_user_log_reattach_to_daemon(void)
for (num=0; num<dlt_user.dlt_ll_ts_num_entries; num++)
{
/* Re-register stored context */
- if ((dlt_user.appID[0]!='\0') && (dlt_user.dlt_ll_ts[num].contextID[0]!='\0') && (dlt_user.dlt_ll_ts))
+ if ((dlt_user.appID[0]!='\0') && (dlt_user.dlt_ll_ts) && (dlt_user.dlt_ll_ts[num].contextID[0]!='\0'))
{
//dlt_set_id(log_new.appID, dlt_user.appID);
dlt_set_id(handle.contextID, dlt_user.dlt_ll_ts[num].contextID);
diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c
index aca8fca..206fa51 100644
--- a/src/shared/dlt_offline_trace.c
+++ b/src/shared/dlt_offline_trace.c
@@ -70,7 +70,9 @@ int dlt_offline_trace_create_new_file(DltOfflineTrace *trace) {
/* set filename */
t = time(NULL);
tmp = localtime(&t);
- if (tmp == NULL) {
+ if (NULL == tmp) {
+ printf("dlt_offline_trace_create_new_file: pointer to tmp is NULL!");
+ return -1;
}
if (strftime(outstr, sizeof(outstr),"%Y%m%d_%H%M%S", tmp) == 0) {
}