From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 21 Jun 2015 21:13:18 +0000 (+0100)
Subject: Feed undefined behaviour.
X-Git-Tag: 1.0.0~520
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59327e94c21c64bc5b2aa7d35d978fefe40dadb5;p=thirdparty%2Frspamd.git

Feed undefined behaviour.
---

diff --git a/src/libutil/map.c b/src/libutil/map.c
index afb31c9531..72f3a78b32 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -422,19 +422,18 @@ rspamd_map_remove_all (struct rspamd_config *cfg)
 gboolean
 rspamd_map_check_proto (const gchar *map_line, gint *res, const gchar **pos)
 {
+	g_assert (res != NULL);
+	g_assert (pos != NULL);
+
 	if (g_ascii_strncasecmp (map_line, "http://",
-		sizeof ("http://") - 1) == 0) {
-		if (res && pos) {
-			*res = MAP_PROTO_HTTP;
-			*pos = map_line + sizeof ("http://") - 1;
-		}
+			sizeof ("http://") - 1) == 0) {
+		*res = MAP_PROTO_HTTP;
+		*pos = map_line + sizeof ("http://") - 1;
 	}
 	else if (g_ascii_strncasecmp (map_line, "file://", sizeof ("file://") -
-		1) == 0) {
-		if (res && pos) {
-			*res = MAP_PROTO_FILE;
-			*pos = map_line + sizeof ("file://") - 1;
-		}
+			1) == 0) {
+		*res = MAP_PROTO_FILE;
+		*pos = map_line + sizeof ("file://") - 1;
 	}
 	else if (*map_line == '/') {
 		/* Trivial file case */