From 483278dda634f89c72892eb6bda69eaf81bb5367 Mon Sep 17 00:00:00 2001 From: Adrian Boczkowski Date: Wed, 12 Dec 2018 08:56:08 +0000 Subject: [PATCH] Fix Klocwork issues Change-Id: I9189751dd8e29047488d2f9634cb0856333436bf Signed-off-by: Adrian Boczkowski --- src/logparser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/logparser.c b/src/logparser.c index 303eb8d7c..4a7b3cbe2 100644 --- a/src/logparser.c +++ b/src/logparser.c @@ -235,8 +235,8 @@ static int logparser_config_match(oconfig_item_t *ci, log_parser_t *parser) { return 0; free_user_data: - if (pattern->user_data != NULL) - pattern->free_user_data(pattern->user_data); + if (user_data != NULL) + logparser_free_user_data(user_data); free_ptr: sfree(ptr); return -1; @@ -575,7 +575,7 @@ static void logparser_process_msg(log_parser_t *parser, message_t *msg, for (size_t i = 0; i < user_data->infos_len; i++) { char *ptr = NULL; - size_t size; + size_t size = 0; switch (user_data->infos[i].type) { case MSG_ITEM_SEVERITY: n.severity = user_data->infos[i].val.severity; @@ -597,7 +597,7 @@ static void logparser_process_msg(log_parser_t *parser, message_t *msg, return; } - if (user_data->infos[i].type != MSG_ITEM_SEVERITY) { + if (ptr != NULL && size > 0) { if (user_data->infos[i].val.str_override != NULL) sstrncpy(ptr, user_data->infos[i].val.str_override, size); else -- 2.47.3