Fix potential issues as found by coverity.

3 files changed, 22 insertions, 22 deletions

diff --git a/src/libmime/expressions.c b/src/libmime/expressions.c
index be64e45da..d1a5df4e9 100644
--- a/src/libmime/expressions.c
+++ b/src/libmime/expressions.c
@@ -438,7 +438,8 @@ parse_expression (rspamd_mempool_t * pool, gchar *line)
 					}
 				}
 				if (stack) {
-					op = delete_expression_stack (&stack);
+					/* Remove open brace itself */
+					delete_expression_stack (&stack);
 				}
 			}
 			else if (*p == '(') {
@@ -844,14 +845,14 @@ parse_regexp (rspamd_mempool_t * pool, const gchar *line, gboolean raw_mode)
 
 	if (result->regexp == NULL || err != NULL) {
 		msg_warn ("could not read regexp: %s while reading regexp %s",
-			err->message,
+				err ? err->message : "unknown error",
 			src);
 		return NULL;
 	}
 
 	if (result->raw_regexp == NULL || err != NULL) {
 		msg_warn ("could not read raw regexp: %s while reading regexp %s",
-			err->message,
+			err ? err->message : "unknown error",
 			src);
 		return NULL;
 	}
diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index 69c1f7c9f..99e888730 100644
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -827,30 +827,29 @@ rspamd_check_action_metric (struct rspamd_task *task,
 	const ucl_object_t *ms = NULL;
 	int i;
 
-	if (metric->actions != NULL) {
-		if (task->settings) {
-			ms = ucl_object_find_key (task->settings, metric->name);
-		}
+	if (task->settings) {
+		ms = ucl_object_find_key (task->settings, metric->name);
+	}
 
-		for (i = METRIC_ACTION_REJECT; i < METRIC_ACTION_MAX; i++) {
-			double sc;
+	for (i = METRIC_ACTION_REJECT; i < METRIC_ACTION_MAX; i++) {
+		double sc;
 
-			action = &metric->actions[i];
-			sc = get_specific_action_score (ms, action);
+		action = &metric->actions[i];
+		sc = get_specific_action_score (ms, action);
 
-			if (sc < 0) {
-				continue;
-			}
-			if (score >= sc && sc > max_score) {
-				selected_action = action;
-				max_score = sc;
-			}
+		if (sc < 0) {
+			continue;
+		}
+		if (score >= sc && sc > max_score) {
+			selected_action = action;
+			max_score = sc;
+		}
 
-			if (rscore != NULL && i == METRIC_ACTION_REJECT) {
-				*rscore = sc;
-			}
+		if (rscore != NULL && i == METRIC_ACTION_REJECT) {
+			*rscore = sc;
 		}
 	}
+
 	if (selected_action) {
 		return selected_action->action;
 	}
diff --git a/src/libmime/images.c b/src/libmime/images.c
index 3b2ceecd1..de542ea18 100644
--- a/src/libmime/images.c
+++ b/src/libmime/images.c
@@ -250,7 +250,7 @@ image_type_str (enum known_image_types type)
 		return "BMP";
 		break;
 	default:
-		return "unknown";
+		break;
 	}
 
 	return "unknown";